diff --git a/JShellAPI/build.gradle b/JShellAPI/build.gradle
index 1aedc46..b6fb3d3 100644
--- a/JShellAPI/build.gradle
+++ b/JShellAPI/build.gradle
@@ -30,8 +30,8 @@ jib {
     to {
         image = 'togetherjava.org:5001/togetherjava/jshellbackend:master' ?: 'latest'
         auth {
-            username = System.getenv('ORG_REGISTRY_USER') ?: ''
-            password = System.getenv('ORG_REGISTRY_PASSWORD') ?: ''
+            username = System.getenv('REGISTRY_USER') ?: ''
+            password = System.getenv('REGISTRY_PASSWORD') ?: ''
         }
     }
     container {
diff --git a/JShellWrapper/build.gradle b/JShellWrapper/build.gradle
index d58b5c7..ebdbd78 100644
--- a/JShellWrapper/build.gradle
+++ b/JShellWrapper/build.gradle
@@ -26,8 +26,8 @@ jib {
     to {
         image = rootProject.ext.jShellWrapperImageName
         auth {
-            username = System.getenv('ORG_REGISTRY_USER') ?: ''
-            password = System.getenv('ORG_REGISTRY_PASSWORD') ?: ''
+            username = System.getenv('REGISTRY_USER') ?: ''
+            password = System.getenv('REGISTRY_PASSWORD') ?: ''
         }
     }
     container {