diff --git a/Jenkinsfile_Common b/Jenkinsfile_Common
index 92d48f0..020c1eb 100644
--- a/Jenkinsfile_Common
+++ b/Jenkinsfile_Common
@@ -72,7 +72,7 @@ def cleanupAutoRevIncludeFile(versionParam) {
 
 def updateSourceRevisions() {
   println "update source revisions to head..."
-  sh(returnStdout: true, script: "bash -c '. ./env.image-ostree > /dev/null && cd ../ && ./src-rev.sh -v -d -r -l ./srcrev.log -a ./autorev-packages.inc'")
+  sh(returnStdout: true, script: "bash -c '. ./env/distro/ostree-image > /dev/null && cd ../ && ./src-rev.sh -v -d -r -l ./srcrev.log -a ./autorev-packages.inc'")
 }
 
 
@@ -180,8 +180,8 @@ def syncSources(src, dst) {
 
 
 def getAutoRevHashes(envType) {
-  def env = "${envType}" == "" ? "" : "-${envType}"
-  def revs = sh(returnStdout: true, script: "bash -c \". ./env.image${env} > /dev/null && buildhistory-collect-srcrevs\"").trim()
+  def env = "${envType}" == "" ? "" : "${envType}-"
+  def revs = sh(returnStdout: true, script: "bash -c \". ./env/distro/${env}image > /dev/null && buildhistory-collect-srcrevs\"").trim()
   return revs
 }
 
diff --git a/Jenkinsfile_RamdiskImages b/Jenkinsfile_RamdiskImages
index 488e29d..467176a 100644
--- a/Jenkinsfile_RamdiskImages
+++ b/Jenkinsfile_RamdiskImages
@@ -145,8 +145,8 @@ def printJobParameters() {
 
 def cleaning(envType) {
   sshagent (credentials: [env.SSH_ID]) {
-    def envPostFix = "${envType}" == "" ? "" : "-${envType}"
-    sh "bash -c '. ./env.image${envPostFix} > /dev/null && bitbake -q -fc cleanall virtual/netmodule-image'"
+    def envPostFix = "${envType}" == "" ? "" : "${envType}-"
+    sh "bash -c '. ./env/distro/${envPostFix}image > /dev/null && bitbake -q -fc cleanall virtual/netmodule-image'"
   }
   dir ("${env.SHARED_BUILD}/tmp") { deleteDir() }
   dir ("${env.SHARED_BUILD}/tmp-glibc") { deleteDir() }
@@ -155,8 +155,8 @@ def cleaning(envType) {
 
 def build(envType, imgType) {
   sshagent (credentials: [env.SSH_ID]) {
-    def envPostFix = "${envType}" == "" ? "" : "-${envType}"
-    sh "bash -c '. ./env.image${envPostFix} > /dev/null && bitbake -q -k virtual/netmodule-image'"
+    def envPostFix = "${envType}" == "" ? "" : "${envType}-"
+    sh "bash -c '. ./env/distro/${envPostFix}image > /dev/null && bitbake -q -k virtual/netmodule-image'"
   }
 }
 
diff --git a/Jenkinsfile_mmcImages b/Jenkinsfile_mmcImages
index d82a1e2..69b06db 100644
--- a/Jenkinsfile_mmcImages
+++ b/Jenkinsfile_mmcImages
@@ -175,7 +175,7 @@ def cleaning(imgType) {
     if (tgtImgType == "vcu")
       distroPostfix = "vcu"
 
-    sh "bash -c '. ./env.image-${distroPostfix} > /dev/null && bitbake -q -fc cleanall netmodule-linux-image${imgTypePostfix}'"
+    sh "bash -c '. ./env/distro/${distroPostfix}-image > /dev/null && bitbake -q -fc cleanall netmodule-linux-image${imgTypePostfix}'"
   }
   dir ("${env.SHARED_BUILD}/tmp") { deleteDir() }
   dir ("${env.SHARED_BUILD}/tmp-glibc") { deleteDir() }
@@ -192,7 +192,7 @@ def build(imgType) {
     if (tgtImgType == "vcu")
       distroPostfix = "vcu"
 
-    sh "bash -c '. ./env.image-${distroPostfix} > /dev/null && bitbake -q -k netmodule-linux-image${imgTypePostfix}'"
+    sh "bash -c '. ./env/distro/${distroPostfix}-image > /dev/null && bitbake -q -k netmodule-linux-image${imgTypePostfix}'"
   }
 }
 
diff --git a/Jenkinsfile_sdk b/Jenkinsfile_sdk
index 6781821..649cc84 100644
--- a/Jenkinsfile_sdk
+++ b/Jenkinsfile_sdk
@@ -95,10 +95,10 @@ pipeline {
         script {
           sshagent (credentials: [env.SSH_ID]) {
             if(env.IS_NM_LINUX_SDK.toBoolean()) {
-              sh "bash -c '. ./env.image-ostree && bitbake -q netmodule-linux-sdk'"
+              sh "bash -c '. ./env/distro/ostree-image && bitbake -q netmodule-linux-sdk'"
             }
             else {
-              sh "bash -c '. ./env.image-ostree && bitbake -q -fc populate_sdk netmodule-linux-image-dev'"
+              sh "bash -c '. ./env/distro/ostree-image && bitbake -q -fc populate_sdk netmodule-linux-image-dev'"
             }
           }
         }
@@ -139,17 +139,17 @@ def cleanLastBuildArtifacts() {
   println "cleaning artifacts from last build..."
   sh "rm -f ${env.YOCTO_DEPLOYS}/*"
   sshagent (credentials: [env.SSH_ID]) {
-    sh "bash -c '. ./env.image-ostree > /dev/null && git fetch -ap && bitbake -q -c cleanall netmodule-linux-sdk'"
+    sh "bash -c '. ./env/distro/ostree-image > /dev/null && git fetch -ap && bitbake -q -c cleanall netmodule-linux-sdk'"
   }
 }
 
 def cleaning(isNmSdk) {
   sshagent (credentials: [env.SSH_ID]) {
     if(env.IS_NM_LINUX_SDK.toBoolean()) {
-      sh "bash -c '. ./env.image-ostree && bitbake -q -fc cleanall netmodule-linux-sdk'"
+      sh "bash -c '. ./env/distro/ostree-image && bitbake -q -fc cleanall netmodule-linux-sdk'"
     }
     else {
-      sh "bash -c '. ./env.image-ostree && bitbake -q -fc cleanall netmodule-linux-image-dev'"
+      sh "bash -c '. ./env/distro/ostree-image && bitbake -q -fc cleanall netmodule-linux-image-dev'"
     }
   }
   dir ("${env.SHARED_BUILD}/tmp") { deleteDir() }
diff --git a/Jenkinsfile_update2head b/Jenkinsfile_update2head
index 1c77498..9f96d06 100644
--- a/Jenkinsfile_update2head
+++ b/Jenkinsfile_update2head
@@ -116,7 +116,7 @@ def updateMachineSrcRevs(machine) {
   env.MACHINE = "${machine}"
   println "update source revisions for ${env.MACHINE} to head..."
   sh("echo '==> ${env.MACHINE} =======================' >> ./${env.SOURCE_REVISION_UPDATE_LOG}")
-  sh(returnStdout: true, script: "bash -c '. ./env.image-ostree > /dev/null && cd ../ && ./src-rev.sh -v -d -r -l ./srcrev.log -a ./autorev-packages.inc'")
+  sh(returnStdout: true, script: "bash -c '. ./env/distro/ostree-image > /dev/null && cd ../ && ./src-rev.sh -v -d -r -l ./srcrev.log -a ./autorev-packages.inc'")
   sh("cat ./srcrev.log >> ./${env.SOURCE_REVISION_UPDATE_LOG}")
 }