diff --git a/cd.sh b/cd.sh
index a2cc590..f4b53ba 100644
--- a/cd.sh
+++ b/cd.sh
@@ -109,7 +109,7 @@ cd_set_environment_variables () {
     esac
     cd_split
     cd_echo "CD_CMD_CLEAN" "CD_CMD_INSTALL" "CD_CMD_UPDATE" "CD_CMD_UPGRADE"
-    #
+    # TODO
     case "${CD_OS_ID}" in
         "${CD_OS_ALMA}")
             CD_OS_REPO="${CD_DEFAULT_REPO_ALMA}"
@@ -175,6 +175,12 @@ Dir::Etc::SourceParts \"\";
             CD_PYTHON_PACKAGES="/usr/lib/python3/dist-packages"
         ;;
     esac
+    cd_split
+    cd_echo "CD_PKG_PKG"
+    cd_split
+    cd_echo "CD_PM_CONF_PATH" "CD_PM_HTTPS_PATH"
+    cd_split
+    cd_echo "CD_PYTHON_COMMAND" "CD_PYTHON_PACKAGE" "CD_PYTHON_PACKAGES"
     # variables
     [ "${CD_CA_1}" ] && CD_CA=true
     # continuous integration platform
@@ -203,12 +209,6 @@ Dir::Etc::SourceParts \"\";
     CD_PROJECT_URL="${CD_PROJECTS_URL}/${CD_PROJECT_NAME}"
     #
     cd_split
-    cd_echo "CD_PKG_PKG"
-    cd_split
-    cd_echo "CD_PM_CONF_PATH" "CD_PM_HTTPS_PATH"
-    cd_split
-    cd_echo "CD_PYTHON_COMMAND" "CD_PYTHON_PACKAGE" "CD_PYTHON_PACKAGES"
-    cd_split
     cd_echo "CD_CA"
     cd_split
     cd_echo "CD_SERVER_URL" \