diff --git a/ci/ext/post_package.d/create_index.sh b/ci/ext/post_package.d/create_index.sh
index 1ad6991..86d0470 100755
--- a/ci/ext/post_package.d/create_index.sh
+++ b/ci/ext/post_package.d/create_index.sh
@@ -12,7 +12,6 @@ mkdir -p $base_dir/ci/build/index-src
 # url for downloading released assets
 release_url="https://github.com/$TRAVIS_REPO_SLUG/releases/download"
 
-# iterate over each repo
 # iterate over each stack
 for stack in $(ls $base_dir/*/stack.yaml 2>/dev/null | sort)
 do
@@ -43,12 +42,17 @@ do
             # Resolve external URL for local / github release
             sed -e "s|${RELEASE_URL}/.*/|file://$assets_dir/|" $index_file_v2_temp > $index_file_local_v2
             if [ "${BUILD_RELEASE}" == "true" ]; then
-                sed -e "s|${RELEASE_URL}/.*/|${RELEASE_URL}/${RELEASE_NAME}/|" $index_file_v2_temp > $index_file_v2
+	            if [ ! -z $RELEASE_NAME ]; then
+    	            sed -e "s|${RELEASE_URL}/.*/|${RELEASE_URL}/${RELEASE_NAME}/|" $index_file_v2_temp > $index_file_v2
+    	        fi
             fi
             rm -f $base_dir/ci/build/index-src/*.yaml
             sed -e "s|${RELEASE_URL}/.*/|{{EXTERNAL_URL}}/|" $index_file_v2_temp > $nginx_file
             rm -f $index_file_v2_temp
-       fi
+        fi
+        
+        popd
+
     else
         echo "SKIPPING: $repo_dir"
     fi
diff --git a/ci/ext/pre_env.d/pre_env.sh b/ci/ext/pre_env.d/pre_env.sh
index c0f5f54..4809f7e 100755
--- a/ci/ext/pre_env.d/pre_env.sh
+++ b/ci/ext/pre_env.d/pre_env.sh
@@ -14,7 +14,7 @@ then
 fi
 if [ -z "${IMAGE_REGISTRY_ORG}" ]
 then
-    export IMAGE_REGISTRY_ORG="ICP4A"
+    export IMAGE_REGISTRY_ORG="icpa"
 fi
 if [ -z "${LATEST_RELEASE}" ]; then
     export LATEST_RELEASE=true
diff --git a/ci/list_artifacts.sh b/ci/list_artifacts.sh
index b744d61..3119ccb 100755
--- a/ci/list_artifacts.sh
+++ b/ci/list_artifacts.sh
@@ -17,4 +17,4 @@ do
 	echo "-------------------------------"
 	cat $index
 	echo "-------------------------------"
-done
\ No newline at end of file
+done