diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 8bf199c45..f7e4d31e3 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -72,7 +72,7 @@ jobs:
           tags: ${{ steps.metadata.outputs.tags }}
           labels: ${{ steps.metadata.outputs.labels }}
           build-args: |
-            dockerRepository=harbor.galasa.dev
+            dockerRepository=ghcr.io
             tag=${{ env.IMAGE_TAG }}
 
       - name: Recycle application in ArgoCD
diff --git a/.github/workflows/pr-build.yaml b/.github/workflows/pr-build.yaml
index 19fd0aa91..7fe26321d 100644
--- a/.github/workflows/pr-build.yaml
+++ b/.github/workflows/pr-build.yaml
@@ -44,6 +44,6 @@ jobs:
           load: true
           tags: managers:test
           build-args: |
-              dockerRepository=harbor.galasa.dev
+              dockerRepository=ghcr.io
               tag=main
     
\ No newline at end of file
diff --git a/dockerfiles/dockerfile b/dockerfiles/dockerfile
index a473265ea..2cc63736a 100644
--- a/dockerfiles/dockerfile
+++ b/dockerfiles/dockerfile
@@ -1,6 +1,6 @@
 ARG dockerRepository
 ARG tag
-FROM ${dockerRepository}/galasadev/galasa-extensions:${tag}
+FROM ${dockerRepository}/galasa-dev/extensions-maven-artefacts:${tag}
 
 COPY repo/ /usr/local/apache2/htdocs/
 COPY managers.githash /usr/local/apache2/htdocs/managers.githash
\ No newline at end of file
diff --git a/galasa-managers-parent/buildSrc/src/main/groovy/galasa.java.gradle b/galasa-managers-parent/buildSrc/src/main/groovy/galasa.java.gradle
index bda13eac0..8e8c39865 100644
--- a/galasa-managers-parent/buildSrc/src/main/groovy/galasa.java.gradle
+++ b/galasa-managers-parent/buildSrc/src/main/groovy/galasa.java.gradle
@@ -58,6 +58,10 @@ repositories {
 }
 
 signing {
+    def signingKeyId = findProperty("signingKeyId")
+    def signingKey = findProperty("signingKey")
+    def signingPassword = findProperty("signingPassword")
+    useInMemoryPgpKeys(signingKeyId, signingKey, signingPassword)
     sign publishing.publications
 }
 
@@ -108,8 +112,8 @@ publishing {
             
             if ("$targetMaven".startsWith('http')) {
                 credentials {
-                    username System.getenv('MAVENUSERNAME')
-                    password System.getenv('MAVENPASSWORD')
+                    username System.getenv("GITHUB_ACTOR")
+                    password System.getenv("GITHUB_TOKEN")
                 }
             }
         }