diff --git a/packs/C++/pipeline.yaml b/packs/C++/pipeline.yaml
index afb9372c1..dc9c8d449 100644
--- a/packs/C++/pipeline.yaml
+++ b/packs/C++/pipeline.yaml
@@ -9,7 +9,7 @@ pipelines:
         name: container-build
     postBuild:
       steps:
-      - sh: jx step post build --image $DOCKER_REGISTRY/$ORG/$APP_NAME:$PREVIEW_VERSION
+      - sh: jx step post build --image $DOCKER_REGISTRY/$DOCKER_REGISTRY_ORG/$APP_NAME:$PREVIEW_VERSION
         name: post-build
     promote:
       steps:
@@ -25,7 +25,7 @@ pipelines:
       steps:
       - sh: export VERSION=`cat VERSION` && skaffold build -f skaffold.yaml
         name: container-build
-      - sh: jx step post build --image $DOCKER_REGISTRY/$ORG/$APP_NAME:\$(cat VERSION)
+      - sh: jx step post build --image $DOCKER_REGISTRY/$DOCKER_REGISTRY_ORG/$APP_NAME:\$(cat VERSION)
         name: post-build
     promote:
       steps:
diff --git a/packs/D/pipeline.yaml b/packs/D/pipeline.yaml
index b6ec611dc..49d72a54c 100644
--- a/packs/D/pipeline.yaml
+++ b/packs/D/pipeline.yaml
@@ -9,7 +9,7 @@ pipelines:
         name: container-build
     postBuild:
       steps:
-      - sh: jx step post build --image $DOCKER_REGISTRY/$ORG/$APP_NAME:$PREVIEW_VERSION
+      - sh: jx step post build --image $DOCKER_REGISTRY/$DOCKER_REGISTRY_ORG/$APP_NAME:$PREVIEW_VERSION
         name: post-build
     promote:
       steps:
@@ -25,7 +25,7 @@ pipelines:
       steps:
       - sh: export VERSION=`cat VERSION` && skaffold build -f skaffold.yaml
         name: container-build
-      - sh: jx step post build --image $DOCKER_REGISTRY/$ORG/$APP_NAME:\$(cat VERSION)
+      - sh: jx step post build --image $DOCKER_REGISTRY/$DOCKER_REGISTRY_ORG/$APP_NAME:\$(cat VERSION)
         name: post-build
     promote:
       steps:
diff --git a/packs/csharp/pipeline.yaml b/packs/csharp/pipeline.yaml
index 8d47f80b3..6a10ebe73 100644
--- a/packs/csharp/pipeline.yaml
+++ b/packs/csharp/pipeline.yaml
@@ -12,7 +12,7 @@ pipelines:
         name: container-build
     postBuild:
       steps:
-      - sh: jx step post build --image $DOCKER_REGISTRY/$ORG/$APP_NAME:$PREVIEW_VERSION
+      - sh: jx step post build --image $DOCKER_REGISTRY/$DOCKER_REGISTRY_ORG/$APP_NAME:$PREVIEW_VERSION
         name: post-build
     promote:
       steps:
@@ -32,7 +32,7 @@ pipelines:
       steps:
       - sh: export VERSION=`cat VERSION` && skaffold build -f skaffold.yaml
         name: container-build
-      - sh: jx step post build --image $DOCKER_REGISTRY/$ORG/$APP_NAME:\$(cat VERSION)
+      - sh: jx step post build --image $DOCKER_REGISTRY/$DOCKER_REGISTRY_ORG/$APP_NAME:\$(cat VERSION)
         name: post-build
     promote:
       steps:
diff --git a/packs/cwp/pipeline.yaml b/packs/cwp/pipeline.yaml
index 09d6cfad7..b6c1653ce 100644
--- a/packs/cwp/pipeline.yaml
+++ b/packs/cwp/pipeline.yaml
@@ -9,7 +9,7 @@ pipelines:
       - sh: export VERSION=$PREVIEW_VERSION && skaffold build -f skaffold.yaml
     postBuild:
       steps:
-      - sh: jx step post build --image $DOCKER_REGISTRY/$ORG/$APP_NAME:$PREVIEW_VERSION
+      - sh: jx step post build --image $DOCKER_REGISTRY/$DOCKER_REGISTRY_ORG/$APP_NAME:$PREVIEW_VERSION
     promote:
       steps:
       - dir: charts/preview
@@ -22,7 +22,7 @@ pipelines:
       steps:
       - sh: skaffold version
       - sh: export VERSION=`cat VERSION` && skaffold build -f skaffold.yaml
-      - sh: jx step post build --image $DOCKER_REGISTRY/$ORG/$APP_NAME:\$(cat VERSION)
+      - sh: jx step post build --image $DOCKER_REGISTRY/$DOCKER_REGISTRY_ORG/$APP_NAME:\$(cat VERSION)
     promote:
       steps:
       - dir: charts/REPLACE_ME_APP_NAME
diff --git a/packs/go-mongodb/pipeline.yaml b/packs/go-mongodb/pipeline.yaml
index 83f8cca2e..c29425231 100644
--- a/packs/go-mongodb/pipeline.yaml
+++ b/packs/go-mongodb/pipeline.yaml
@@ -8,7 +8,7 @@ pipelines:
       - sh: export VERSION=$PREVIEW_VERSION && skaffold build -f skaffold.yaml
     postBuild:
       steps:
-      - sh: jx step post build --image $DOCKER_REGISTRY/$ORG/$APP_NAME:$PREVIEW_VERSION
+      - sh: jx step post build --image $DOCKER_REGISTRY/$DOCKER_REGISTRY_ORG/$APP_NAME:$PREVIEW_VERSION
     promote:
       steps:
       - dir: /home/jenkins/go/src/REPLACE_ME_GIT_PROVIDER/REPLACE_ME_ORG/REPLACE_ME_APP_NAME/charts/preview
@@ -20,7 +20,7 @@ pipelines:
     build:
       steps:
       - sh: export VERSION=`cat VERSION` && skaffold build -f skaffold.yaml
-      - sh: jx step post build --image $DOCKER_REGISTRY/$ORG/$APP_NAME:\$(cat VERSION)
+      - sh: jx step post build --image $DOCKER_REGISTRY/$DOCKER_REGISTRY_ORG/$APP_NAME:\$(cat VERSION)
     promote:
       steps:
       - dir: /home/jenkins/go/src/REPLACE_ME_GIT_PROVIDER/REPLACE_ME_ORG/REPLACE_ME_APP_NAME/charts/REPLACE_ME_APP_NAME
diff --git a/packs/go/pipeline.yaml b/packs/go/pipeline.yaml
index d7887609a..856ed0339 100644
--- a/packs/go/pipeline.yaml
+++ b/packs/go/pipeline.yaml
@@ -9,7 +9,7 @@ pipelines:
         name: container-build
     postBuild:
       steps:
-      - sh: jx step post build --image $DOCKER_REGISTRY/$ORG/$APP_NAME:$PREVIEW_VERSION
+      - sh: jx step post build --image $DOCKER_REGISTRY/$DOCKER_REGISTRY_ORG/$APP_NAME:$PREVIEW_VERSION
         name: post-build
     promote:
       steps:
@@ -25,7 +25,7 @@ pipelines:
       steps:
       - sh: export VERSION=`cat VERSION` && skaffold build -f skaffold.yaml
         name: container-build
-      - sh: jx step post build --image $DOCKER_REGISTRY/$ORG/$APP_NAME:\$(cat VERSION)
+      - sh: jx step post build --image $DOCKER_REGISTRY/$DOCKER_REGISTRY_ORG/$APP_NAME:\$(cat VERSION)
         name: post-build
     promote:
       steps:
diff --git a/packs/gradle/pipeline.yaml b/packs/gradle/pipeline.yaml
index 71f68dcf8..d978cbfd1 100644
--- a/packs/gradle/pipeline.yaml
+++ b/packs/gradle/pipeline.yaml
@@ -9,7 +9,7 @@ pipelines:
         name: container-build
     postBuild:
       steps:
-      - sh: jx step post build --image $DOCKER_REGISTRY/$ORG/$APP_NAME:$PREVIEW_VERSION
+      - sh: jx step post build --image $DOCKER_REGISTRY/$DOCKER_REGISTRY_ORG/$APP_NAME:$PREVIEW_VERSION
         name: post-build
     promote:
       steps:
@@ -25,7 +25,7 @@ pipelines:
       steps:
       - sh: export VERSION=`cat VERSION` && skaffold build -f skaffold.yaml
         name: container-build
-      - sh: jx step post build --image $DOCKER_REGISTRY/$ORG/$APP_NAME:\$(cat VERSION)
+      - sh: jx step post build --image $DOCKER_REGISTRY/$DOCKER_REGISTRY_ORG/$APP_NAME:\$(cat VERSION)
         name: post-build
     promote:
       steps:
diff --git a/packs/javascript-ui-nginx/pipeline.yaml b/packs/javascript-ui-nginx/pipeline.yaml
index 6b68d3baf..b09f4a223 100644
--- a/packs/javascript-ui-nginx/pipeline.yaml
+++ b/packs/javascript-ui-nginx/pipeline.yaml
@@ -11,7 +11,7 @@ pipelines:
         name: container-build
     postBuild:
       steps:
-      - sh: jx step post build --image $DOCKER_REGISTRY/$ORG/$APP_NAME:$PREVIEW_VERSION
+      - sh: jx step post build --image $DOCKER_REGISTRY/$DOCKER_REGISTRY_ORG/$APP_NAME:$PREVIEW_VERSION
         name: post-build
     promote:
       steps:
@@ -29,7 +29,7 @@ pipelines:
         name: ui-build
       - sh: export VERSION=`cat VERSION` && skaffold build -f skaffold.yaml
         name: container-build
-      - sh: jx step post build --image $DOCKER_REGISTRY/$ORG/$APP_NAME:\$(cat VERSION)
+      - sh: jx step post build --image $DOCKER_REGISTRY/$DOCKER_REGISTRY_ORG/$APP_NAME:\$(cat VERSION)
         name: post-build
     promote:
       steps:
diff --git a/packs/javascript/pipeline.yaml b/packs/javascript/pipeline.yaml
index adcf4e001..9bfa4088b 100644
--- a/packs/javascript/pipeline.yaml
+++ b/packs/javascript/pipeline.yaml
@@ -9,7 +9,7 @@ pipelines:
         name: container-build
     postBuild:
       steps:
-      - sh: jx step post build --image $DOCKER_REGISTRY/$ORG/$APP_NAME:$PREVIEW_VERSION
+      - sh: jx step post build --image $DOCKER_REGISTRY/$DOCKER_REGISTRY_ORG/$APP_NAME:$PREVIEW_VERSION
         name: post-build
     promote:
       steps:
@@ -25,7 +25,7 @@ pipelines:
       steps:
       - sh: export VERSION=`cat VERSION` && skaffold build -f skaffold.yaml
         name: container-build
-      - sh: jx step post build --image $DOCKER_REGISTRY/$ORG/$APP_NAME:\$(cat VERSION)
+      - sh: jx step post build --image $DOCKER_REGISTRY/$DOCKER_REGISTRY_ORG/$APP_NAME:\$(cat VERSION)
         name: post-build
     promote:
       steps:
diff --git a/packs/maven-node-ruby/pipeline.yaml b/packs/maven-node-ruby/pipeline.yaml
index f881ef2b8..0c7ec77cc 100644
--- a/packs/maven-node-ruby/pipeline.yaml
+++ b/packs/maven-node-ruby/pipeline.yaml
@@ -11,7 +11,7 @@ pipelines:
         name: container-build
     postBuild:
       steps:
-      - sh: jx step post build --image $DOCKER_REGISTRY/$ORG/$APP_NAME:$PREVIEW_VERSION
+      - sh: jx step post build --image $DOCKER_REGISTRY/$DOCKER_REGISTRY_ORG/$APP_NAME:$PREVIEW_VERSION
         name: post-build
     promote:
       steps:
@@ -29,7 +29,7 @@ pipelines:
         name: skaffold-version
       - sh: export VERSION=`cat VERSION` && skaffold build -f skaffold.yaml
         name: container-build
-      - sh: jx step post build --image $DOCKER_REGISTRY/$ORG/$APP_NAME:\$(cat VERSION)
+      - sh: jx step post build --image $DOCKER_REGISTRY/$DOCKER_REGISTRY_ORG/$APP_NAME:\$(cat VERSION)
         name: post-build
     promote:
       steps:
diff --git a/packs/maven/pipeline.yaml b/packs/maven/pipeline.yaml
index f881ef2b8..0c7ec77cc 100644
--- a/packs/maven/pipeline.yaml
+++ b/packs/maven/pipeline.yaml
@@ -11,7 +11,7 @@ pipelines:
         name: container-build
     postBuild:
       steps:
-      - sh: jx step post build --image $DOCKER_REGISTRY/$ORG/$APP_NAME:$PREVIEW_VERSION
+      - sh: jx step post build --image $DOCKER_REGISTRY/$DOCKER_REGISTRY_ORG/$APP_NAME:$PREVIEW_VERSION
         name: post-build
     promote:
       steps:
@@ -29,7 +29,7 @@ pipelines:
         name: skaffold-version
       - sh: export VERSION=`cat VERSION` && skaffold build -f skaffold.yaml
         name: container-build
-      - sh: jx step post build --image $DOCKER_REGISTRY/$ORG/$APP_NAME:\$(cat VERSION)
+      - sh: jx step post build --image $DOCKER_REGISTRY/$DOCKER_REGISTRY_ORG/$APP_NAME:\$(cat VERSION)
         name: post-build
     promote:
       steps:
diff --git a/packs/ml-python-gpu-service/pipeline.yaml b/packs/ml-python-gpu-service/pipeline.yaml
index 862b2c9fa..92382ffd4 100644
--- a/packs/ml-python-gpu-service/pipeline.yaml
+++ b/packs/ml-python-gpu-service/pipeline.yaml
@@ -13,7 +13,7 @@ pipelines:
       - sh: export VERSION=$PREVIEW_VERSION && skaffold build -f skaffold.yaml
     postBuild:
       steps:
-      - sh: jx step post build --image $DOCKER_REGISTRY/$ORG/$APP_NAME:$PREVIEW_VERSION
+      - sh: jx step post build --image $DOCKER_REGISTRY/$DOCKER_REGISTRY_ORG/$APP_NAME:$PREVIEW_VERSION
     promote:
       steps:
       - dir: ./charts/preview
@@ -46,7 +46,7 @@ pipelines:
       - sh: source /root/.bashrc && pytest
         name: testing
       - sh: export VERSION=`cat VERSION` && skaffold build -f skaffold.yaml
-      - sh: jx step post build --image $DOCKER_REGISTRY/$ORG/$APP_NAME:\$(cat VERSION)
+      - sh: jx step post build --image $DOCKER_REGISTRY/$DOCKER_REGISTRY_ORG/$APP_NAME:\$(cat VERSION)
     promote:
       steps:
       - dir: ./charts/REPLACE_ME_APP_NAME
diff --git a/packs/ml-python-service/pipeline.yaml b/packs/ml-python-service/pipeline.yaml
index 7a70226d0..cf0fc5349 100644
--- a/packs/ml-python-service/pipeline.yaml
+++ b/packs/ml-python-service/pipeline.yaml
@@ -13,7 +13,7 @@ pipelines:
       - sh: export VERSION=$PREVIEW_VERSION && skaffold build -f skaffold.yaml
     postBuild:
       steps:
-      - sh: jx step post build --image $DOCKER_REGISTRY/$ORG/$APP_NAME:$PREVIEW_VERSION
+      - sh: jx step post build --image $DOCKER_REGISTRY/$DOCKER_REGISTRY_ORG/$APP_NAME:$PREVIEW_VERSION
     promote:
       steps:
       - dir: ./charts/preview
@@ -46,7 +46,7 @@ pipelines:
       - sh: source /root/.bashrc && pytest
         name: testing
       - sh: export VERSION=`cat VERSION` && skaffold build -f skaffold.yaml
-      - sh: jx step post build --image $DOCKER_REGISTRY/$ORG/$APP_NAME:\$(cat VERSION)
+      - sh: jx step post build --image $DOCKER_REGISTRY/$DOCKER_REGISTRY_ORG/$APP_NAME:\$(cat VERSION)
     promote:
       steps:
       - dir: ./charts/REPLACE_ME_APP_NAME
diff --git a/packs/php/pipeline.yaml b/packs/php/pipeline.yaml
index 8d47f80b3..6a10ebe73 100644
--- a/packs/php/pipeline.yaml
+++ b/packs/php/pipeline.yaml
@@ -12,7 +12,7 @@ pipelines:
         name: container-build
     postBuild:
       steps:
-      - sh: jx step post build --image $DOCKER_REGISTRY/$ORG/$APP_NAME:$PREVIEW_VERSION
+      - sh: jx step post build --image $DOCKER_REGISTRY/$DOCKER_REGISTRY_ORG/$APP_NAME:$PREVIEW_VERSION
         name: post-build
     promote:
       steps:
@@ -32,7 +32,7 @@ pipelines:
       steps:
       - sh: export VERSION=`cat VERSION` && skaffold build -f skaffold.yaml
         name: container-build
-      - sh: jx step post build --image $DOCKER_REGISTRY/$ORG/$APP_NAME:\$(cat VERSION)
+      - sh: jx step post build --image $DOCKER_REGISTRY/$DOCKER_REGISTRY_ORG/$APP_NAME:\$(cat VERSION)
         name: post-build
     promote:
       steps:
diff --git a/packs/python/pipeline.yaml b/packs/python/pipeline.yaml
index 68d880057..e5386619f 100644
--- a/packs/python/pipeline.yaml
+++ b/packs/python/pipeline.yaml
@@ -9,7 +9,7 @@ pipelines:
         name: container-build
     postBuild:
       steps:
-      - sh: jx step post build --image $DOCKER_REGISTRY/$ORG/$APP_NAME:$PREVIEW_VERSION
+      - sh: jx step post build --image $DOCKER_REGISTRY/$DOCKER_REGISTRY_ORG/$APP_NAME:$PREVIEW_VERSION
         name: post-build
     promote:
       steps:
@@ -25,7 +25,7 @@ pipelines:
       steps:
       - sh: export VERSION=`cat VERSION` && skaffold build -f skaffold.yaml
         name: container-build
-      - sh: jx step post build --image $DOCKER_REGISTRY/$ORG/$APP_NAME:\$(cat VERSION)
+      - sh: jx step post build --image $DOCKER_REGISTRY/$DOCKER_REGISTRY_ORG/$APP_NAME:\$(cat VERSION)
         name: post-build
     promote:
       steps:
diff --git a/packs/ruby/pipeline.yaml b/packs/ruby/pipeline.yaml
index 1d70617c0..df251a465 100644
--- a/packs/ruby/pipeline.yaml
+++ b/packs/ruby/pipeline.yaml
@@ -12,7 +12,7 @@ pipelines:
         name: container-build
     postBuild:
       steps:
-      - sh: jx step post build --image $DOCKER_REGISTRY/$ORG/$APP_NAME:$PREVIEW_VERSION
+      - sh: jx step post build --image $DOCKER_REGISTRY/$DOCKER_REGISTRY_ORG/$APP_NAME:$PREVIEW_VERSION
         name: post-build
     promote:
       steps:
@@ -32,7 +32,7 @@ pipelines:
       steps:
       - sh: export VERSION=`cat VERSION` && skaffold build -f skaffold.yaml
         name: container-build
-      - sh: jx step post build --image $DOCKER_REGISTRY/$ORG/$APP_NAME:\$(cat VERSION)
+      - sh: jx step post build --image $DOCKER_REGISTRY/$DOCKER_REGISTRY_ORG/$APP_NAME:\$(cat VERSION)
         name: post-build
     promote:
       steps:
diff --git a/packs/rust/pipeline.yaml b/packs/rust/pipeline.yaml
index cab0544d6..a92e8c3ca 100644
--- a/packs/rust/pipeline.yaml
+++ b/packs/rust/pipeline.yaml
@@ -9,7 +9,7 @@ pipelines:
         name: container-build
     postBuild:
       steps:
-      - sh: jx step post build --image $DOCKER_REGISTRY/$ORG/$APP_NAME:$PREVIEW_VERSION
+      - sh: jx step post build --image $DOCKER_REGISTRY/$DOCKER_REGISTRY_ORG/$APP_NAME:$PREVIEW_VERSION
         name: post-build
     promote:
       steps:
@@ -25,7 +25,7 @@ pipelines:
       steps:
       - sh: export VERSION=`cat VERSION` && skaffold build -f skaffold.yaml
         name: container-build
-      - sh: jx step post build --image $DOCKER_REGISTRY/$ORG/$APP_NAME:\$(cat VERSION)
+      - sh: jx step post build --image $DOCKER_REGISTRY/$DOCKER_REGISTRY_ORG/$APP_NAME:\$(cat VERSION)
         name: post-build
     promote:
       steps:
diff --git a/packs/scala/pipeline.yaml b/packs/scala/pipeline.yaml
index c19458f6b..564b287be 100644
--- a/packs/scala/pipeline.yaml
+++ b/packs/scala/pipeline.yaml
@@ -9,7 +9,7 @@ pipelines:
         name: container-build
     postBuild:
       steps:
-      - sh: jx step post build --image $DOCKER_REGISTRY/$ORG/$APP_NAME:$PREVIEW_VERSION
+      - sh: jx step post build --image $DOCKER_REGISTRY/$DOCKER_REGISTRY_ORG/$APP_NAME:$PREVIEW_VERSION
         name: post-build
     promote:
       steps:
@@ -25,7 +25,7 @@ pipelines:
       steps:
       - sh: export VERSION=`cat VERSION` && skaffold build -f skaffold.yaml
         name: container-build
-      - sh: jx step post build --image $DOCKER_REGISTRY/$ORG/$APP_NAME:\$(cat VERSION)
+      - sh: jx step post build --image $DOCKER_REGISTRY/$DOCKER_REGISTRY_ORG/$APP_NAME:\$(cat VERSION)
         name: post-build
     promote:
       steps: