diff --git a/packages/deployer/deploy-frontend.sh b/packages/deployer/deploy-frontend.sh
index cb87f27b..06840745 100755
--- a/packages/deployer/deploy-frontend.sh
+++ b/packages/deployer/deploy-frontend.sh
@@ -26,7 +26,7 @@ if [ -z "$NEW_APPLICATION_VERSION" ] || [ "1" == "$NEW_APPLICATION_VERSION" ]; t
 fi
 
 # Generate application-deployment-request.yml
-cat > ./records/application-deployment-request.yml <<EOF
+cat >./records/application-deployment-request.yml <<EOF
 record:
   type: ApplicationDeploymentRequest
   version: '1.0.0'
@@ -37,9 +37,9 @@ record:
     env:
       LACONIC_HOSTED_CONFIG_server_url: https://snowballtools-base-api-001.apps.snowballtools.com
       LACONIC_HOSTED_CONFIG_github_clientid: b7c63b235ca1dd5639ab
-      LACONIC_HOSTED_CONFIG_github_templaterepo: snowball-tools-platform/test-progressive-web-app
-      LACONIC_HOSTED_CONFIG_github_pwa_templaterepo: snowball-tools-platform/test-progressive-web-app
-      LACONIC_HOSTED_CONFIG_github_image_upload_templaterepo: snowball-tools-platform/image-upload-pwa-example
+      LACONIC_HOSTED_CONFIG_github_templaterepo: snowball-tools/test-progressive-web-app
+      LACONIC_HOSTED_CONFIG_github_pwa_templaterepo: snowball-tools/test-progressive-web-app
+      LACONIC_HOSTED_CONFIG_github_image_upload_templaterepo: snowball-tools/image-upload-pwa-example
       LACONIC_HOSTED_CONFIG_wallet_connect_id: eda9ba18042a5ea500f358194611ece2
   meta:
     note: Added by Snowball @ $CURRENT_DATE_TIME
@@ -48,7 +48,7 @@ record:
 EOF
 
 # Generate application-record.yml with incremented version
-cat > ./records/application-record.yml <<EOF
+cat >./records/application-record.yml <<EOF
 record:
   type: ApplicationRecord
   version: $NEW_APPLICATION_VERSION
diff --git a/packages/deployer/deploy-frontend.staging.sh b/packages/deployer/deploy-frontend.staging.sh
index 9f7bea47..349893f8 100755
--- a/packages/deployer/deploy-frontend.staging.sh
+++ b/packages/deployer/deploy-frontend.staging.sh
@@ -26,7 +26,7 @@ if [ -z "$NEW_APPLICATION_VERSION" ] || [ "1" == "$NEW_APPLICATION_VERSION" ]; t
 fi
 
 # Generate application-deployment-request.yml
-cat > ./staging-records/application-deployment-request.yml <<EOF
+cat >./staging-records/application-deployment-request.yml <<EOF
 record:
   type: ApplicationDeploymentRequest
   version: '1.0.0'
@@ -36,10 +36,10 @@ record:
   config:
     env:
       LACONIC_HOSTED_CONFIG_server_url: https://snowballtools-base-api.staging.apps.snowballtools.com
-      LACONIC_HOSTED_CONFIG_github_clientid: 905c09553f527d2cdff5
+      LACONIC_HOSTED_CONFIG_github_clientid: Ov23liOaoahRTYd4nSCV
       LACONIC_HOSTED_CONFIG_github_templaterepo: snowball-tools/test-progressive-web-app
-      LACONIC_HOSTED_CONFIG_github_pwa_templaterepo: snowball-tools/image-upload-pwa-example
-      LACONIC_HOSTED_CONFIG_github_image_upload_templaterepo: snowball-tools-platform/image-upload-pwa-example
+      LACONIC_HOSTED_CONFIG_github_pwa_templaterepo: snowball-tools/test-progressive-web-app
+      LACONIC_HOSTED_CONFIG_github_image_upload_templaterepo: snowball-tools/image-upload-pwa-example
       LACONIC_HOSTED_CONFIG_wallet_connect_id: eda9ba18042a5ea500f358194611ece2
       LACONIC_HOSTED_CONFIG_lit_relay_api_key: 15DDD969-E75F-404D-AAD9-58A37C4FD354_snowball
       LACONIC_HOSTED_CONFIG_aplchemy_api_key: THvPart_gqI5x02RNYSBntlmwA66I_qc
@@ -54,7 +54,7 @@ record:
 EOF
 
 # Generate application-record.yml with incremented version
-cat > ./staging-records/application-record.yml <<EOF
+cat >./staging-records/application-record.yml <<EOF
 record:
   type: ApplicationRecord
   version: $NEW_APPLICATION_VERSION
diff --git a/packages/deployer/records/application-deployment-request.yml b/packages/deployer/records/application-deployment-request.yml
index 1426c36d..4ac07d40 100644
--- a/packages/deployer/records/application-deployment-request.yml
+++ b/packages/deployer/records/application-deployment-request.yml
@@ -1,6 +1,6 @@
 record:
   type: ApplicationDeploymentRequest
-  version: '1.0.0'
+  version: "1.0.0"
   name: snowballtools-base-frontend@0.1.8
   application: crn://snowballtools/applications/snowballtools-base-frontend@0.1.8
   dns: dashboard
@@ -8,9 +8,9 @@ record:
     env:
       LACONIC_HOSTED_CONFIG_app_server_url: https://snowballtools-base-api-001.apps.snowballtools.com
       LACONIC_HOSTED_CONFIG_app_github_clientid: b7c63b235ca1dd5639ab
-      LACONIC_HOSTED_CONFIG_app_github_templaterepo: snowball-tools-platform/test-progressive-web-app
-      LACONIC_HOSTED_CONFIG_app_github_pwa_templaterepo: snowball-tools-platform/test-progressive-web-app
-      LACONIC_HOSTED_CONFIG_app_github_image_upload_templaterepo: snowball-tools-platform/image-upload-pwa-example
+      LACONIC_HOSTED_CONFIG_app_github_templaterepo: snowball-tools/test-progressive-web-app
+      LACONIC_HOSTED_CONFIG_app_github_pwa_templaterepo: snowball-tools/test-progressive-web-app
+      LACONIC_HOSTED_CONFIG_app_github_image_upload_templaterepo: snowball-tools/image-upload-pwa-example
       LACONIC_HOSTED_CONFIG_app_wallet_connect_id: eda9ba18042a5ea500f358194611ece2
   meta:
     note: Added by Snowball @ Thu Apr  4 14:49:41 UTC 2024
diff --git a/packages/deployer/staging-records/application-deployment-request.yml b/packages/deployer/staging-records/application-deployment-request.yml
index 98e53772..02f8fdf6 100644
--- a/packages/deployer/staging-records/application-deployment-request.yml
+++ b/packages/deployer/staging-records/application-deployment-request.yml
@@ -7,18 +7,18 @@ record:
   config:
     env:
       LACONIC_HOSTED_CONFIG_server_url: https://snowballtools-base-api.staging.apps.snowballtools.com
-      LACONIC_HOSTED_CONFIG_github_clientid: 905c09553f527d2cdff5
+      LACONIC_HOSTED_CONFIG_github_clientid: Ov23liOaoahRTYd4nSCV
       LACONIC_HOSTED_CONFIG_github_templaterepo: snowball-tools/test-progressive-web-app
-      LACONIC_HOSTED_CONFIG_github_pwa_templaterepo: snowball-tools/image-upload-pwa-example
-      LACONIC_HOSTED_CONFIG_github_image_upload_templaterepo: snowball-tools-platform/image-upload-pwa-example
+      LACONIC_HOSTED_CONFIG_github_pwa_templaterepo: snowball-tools/test-progressive-web-app
+      LACONIC_HOSTED_CONFIG_github_image_upload_templaterepo: snowball-tools/image-upload-pwa-example
       LACONIC_HOSTED_CONFIG_wallet_connect_id: eda9ba18042a5ea500f358194611ece2
       LACONIC_HOSTED_CONFIG_lit_relay_api_key: 15DDD969-E75F-404D-AAD9-58A37C4FD354_snowball
       LACONIC_HOSTED_CONFIG_aplchemy_api_key: THvPart_gqI5x02RNYSBntlmwA66I_qc
       LACONIC_HOSTED_CONFIG_bugsnag_api_key: 8c480cd5386079f9dd44f9581264a073
-      LACONIC_HOSTED_CONFIG_passkey_wallet_rpid: localhost
-      LACONIC_HOSTED_CONFIG_turnkey_api_base_url: https://api.turnkey.com/
+      LACONIC_HOSTED_CONFIG_passkey_wallet_rpid: dashboard.staging.apps.snowballtools.com
+      LACONIC_HOSTED_CONFIG_turnkey_api_base_url: https://api.turnkey.com
       LACONIC_HOSTED_CONFIG_turnkey_organization_id: 5049ae99-5bca-40b3-8317-504384d4e591
   meta:
-    note: Added by Snowball @ Tuesday 21 May 2024 06:17:23 AM UTC
+    note: Added by Snowball @ Sat Jun 22 02:49:45 UTC 2024
     repository: "https://git.vdb.to/cerc-io/snowballtools-base"
-    repository_ref: 8488cfab8353321ed05c4234bf1b914c9ad3aa99
+    repository_ref: 61e3e88a6c9d57e95441059369ee5a46f5c07601
diff --git a/packages/deployer/staging-records/application-record.yml b/packages/deployer/staging-records/application-record.yml
index 5234fc18..fa9b4089 100644
--- a/packages/deployer/staging-records/application-record.yml
+++ b/packages/deployer/staging-records/application-record.yml
@@ -1,7 +1,7 @@
 record:
   type: ApplicationRecord
-  version: 0.0.2
-  repository_ref: 8488cfab8353321ed05c4234bf1b914c9ad3aa99
+  version: 0.0.1
+  repository_ref: 61e3e88a6c9d57e95441059369ee5a46f5c07601
   repository: ["https://git.vdb.to/cerc-io/snowballtools-base"]
   app_type: webapp
   name: staging-snowballtools-base-frontend
diff --git a/packages/deployer/test/README.md b/packages/deployer/test/README.md
index 88c43cfb..712d719d 100644
--- a/packages/deployer/test/README.md
+++ b/packages/deployer/test/README.md
@@ -2,7 +2,7 @@
 
 Check if the live web app deployer is in a working state
 
-- Web app repo used: https://github.com/snowball-tools-platform/test-progressive-web-app (main branch)
+- Web app repo used: <https://github.com/snowball-tools/test-progressive-web-app> (main branch)
 - Config used: [../config.yml](../config.yml)
 - The script [test-webapp-deployment-undeployment.sh](./test-webapp-deployment-undeployment.sh) performs the following:
   - Create / update [`ApplicationRecord`](./records/application-record.yml) and [`ApplicationDeploymentRequest`](./records/application-deployment-request.yml) records with latest meta data from the repo
diff --git a/packages/deployer/test/records/application-deployment-request.yml b/packages/deployer/test/records/application-deployment-request.yml
index 17fee5fa..2f7df4ae 100644
--- a/packages/deployer/test/records/application-deployment-request.yml
+++ b/packages/deployer/test/records/application-deployment-request.yml
@@ -1,6 +1,6 @@
 record:
   type: ApplicationDeploymentRequest
-  version: '1.0.0'
+  version: "1.0.0"
   name: deployment-test-app@0.1.24
   application: crn://snowballtools/applications/deployment-test-app@0.1.24
   dns: deployment-ci-test
@@ -11,5 +11,5 @@ record:
       CERC_WEBAPP_DEBUG: 0
   meta:
     note: Deployment test @ Thu 11 Apr 2024 07:29:19 AM UTC
-    repository: "https://github.com/snowball-tools-platform/test-progressive-web-app"
+    repository: "https://github.com/snowball-tools/test-progressive-web-app"
     repository_ref: 05819619487a0d2dbc5453b6d1ccff3044c0dd26
diff --git a/packages/deployer/test/records/application-record.yml b/packages/deployer/test/records/application-record.yml
index f6c24d39..6c599c8d 100644
--- a/packages/deployer/test/records/application-record.yml
+++ b/packages/deployer/test/records/application-record.yml
@@ -2,7 +2,7 @@ record:
   type: ApplicationRecord
   version: 0.0.1
   repository_ref: 05819619487a0d2dbc5453b6d1ccff3044c0dd26
-  repository: ["https://github.com/snowball-tools-platform/test-progressive-web-app"]
+  repository: ["https://github.com/snowball-tools/test-progressive-web-app"]
   app_type: webapp
   name: deployment-test-app
   app_version: 0.1.24
diff --git a/packages/deployer/test/test-webapp-deployment-undeployment.sh b/packages/deployer/test/test-webapp-deployment-undeployment.sh
index 4817fb9b..f221811e 100755
--- a/packages/deployer/test/test-webapp-deployment-undeployment.sh
+++ b/packages/deployer/test/test-webapp-deployment-undeployment.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # Repository URL
-REPO_URL="https://github.com/snowball-tools-platform/test-progressive-web-app"
+REPO_URL="https://github.com/snowball-tools/test-progressive-web-app"
 
 # Get the latest commit hash from the repository
 LATEST_HASH=$(git ls-remote $REPO_URL HEAD | awk '{print $1}')
@@ -32,7 +32,7 @@ fi
 # Generate application-record.yml with incremented version
 RECORD_FILE=packages/deployer/test/records/application-record.yml
 
-cat > $RECORD_FILE <<EOF
+cat >$RECORD_FILE <<EOF
 record:
   type: ApplicationRecord
   version: $NEW_APPLICATION_VERSION
@@ -46,7 +46,7 @@ EOF
 # Generate application-deployment-request.yml
 REQUEST_RECORD_FILE=packages/deployer/test/records/application-deployment-request.yml
 
-cat > $REQUEST_RECORD_FILE <<EOF
+cat >$REQUEST_RECORD_FILE <<EOF
 record:
   type: ApplicationDeploymentRequest
   version: '1.0.0'
@@ -115,7 +115,7 @@ while true; do
     else
       echo "ApplicationDeploymentRecord not found, retrying in $RETRY_INTERVAL sec..."
       sleep $RETRY_INTERVAL
-      retry_count=$((retry_count+1))
+      retry_count=$((retry_count + 1))
     fi
   else
     echo "ApplicationDeploymentRecord found"
@@ -154,7 +154,7 @@ while true; do
     else
       echo "Deployment URL $fetched_url is not active, received code $url_response, retrying in $retry_interval sec..."
       sleep $retry_interval
-      retry_count=$((retry_count+1))
+      retry_count=$((retry_count + 1))
     fi
   fi
 done
@@ -162,7 +162,7 @@ done
 # Generate application-deployment-removal-request.yml
 REMOVAL_REQUEST_RECORD_FILE=packages/deployer/test/records/application-deployment-removal-request.yml
 
-cat > $REMOVAL_REQUEST_RECORD_FILE <<EOF
+cat >$REMOVAL_REQUEST_RECORD_FILE <<EOF
 record:
   deployment: $DEPLOYMENT_RECORD_ID
   type: ApplicationDeploymentRemovalRequest
@@ -190,7 +190,7 @@ while true; do
     else
       echo "ApplicationDeploymentRemovalRecord not found, retrying in $RETRY_INTERVAL sec..."
       sleep $RETRY_INTERVAL
-      retry_count=$((retry_count+1))
+      retry_count=$((retry_count + 1))
     fi
   else
     echo "ApplicationDeploymentRemovalRecord found"
@@ -217,7 +217,7 @@ while true; do
     else
       echo "Deployment URL $fetched_url is still active, received code $url_response, retrying in $retry_interval sec..."
       sleep $retry_interval
-      retry_count=$((retry_count+1))
+      retry_count=$((retry_count + 1))
     fi
   fi
 done