diff --git a/engine/library/deploy-lib.sh b/engine/library/deploy-lib.sh
index 1cd8464..5db3543 100755
--- a/engine/library/deploy-lib.sh
+++ b/engine/library/deploy-lib.sh
@@ -74,7 +74,7 @@
   PDF=${PDF:-"https://gerrit.nordix.org/gitweb?p=infra/hwconfig.git;a=blob_plain;f=pods/nordix-vpod1-pdf.yml"}
   IDF=${IDF:-"https://gerrit.nordix.org/gitweb?p=infra/hwconfig.git;a=blob_plain;f=pods/nordix-vpod1-idf.yml"}
   OPENRC="${OPENRC:-''}"
-  DISTRO="${OPENRC:-ubuntu1804}"
+  DISTRO="${DISTRO:-ubuntu1804}"
   VERBOSITY=${VERBOSITY:-false}
   EXECUTION_MODE=${EXECUTION_MODE:-online-deployment}
 
diff --git a/engine/library/package-lib.sh b/engine/library/package-lib.sh
index dc41c58..5ab92ed 100755
--- a/engine/library/package-lib.sh
+++ b/engine/library/package-lib.sh
@@ -67,7 +67,7 @@
   STACK_TYPE=${STACK_TYPE:-kubernetes}
   STACK_VERSION=${STACK_VERSION:-master}
   PACKAGING_PROFILE=${PACKAGING_PROFILE:-full}
-  DISTRO=${PACKAGING_PROFILE:-ubuntu1804}
+  DISTRO=${DISTRO:-ubuntu1804}
   VERBOSITY=${VERBOSITY:-false}
 
   # TODO (fdegir): This function is left here so we can introduce additional