diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 879d4f9..5042b10 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -63,8 +63,9 @@ jobs:
         env:
           VERSION: ${{ steps.get_version.outputs.VERSION }}
         with:
-          name: siemp/adcs-controller
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
+          name: pearj/adcs-issuer
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
           buildargs: VERSION
           tags: "latest,${{ env.VERSION }}"
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 9b90633..3464e26 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -17,8 +17,8 @@ jobs:
       - name: Publish to Registry
         uses: elgohr/Publish-Docker-Github-Action@master
         with:
-          name: siemp/adcs-controller
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
+          name: ghcr.io/pearj/adcs-issuer
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
           buildargs: VERSION
-          tags: "latest,${{ env.VERSION }}"
\ No newline at end of file
+          tags: "latest,${{ env.VERSION }}"
diff --git a/Dockerfile b/Dockerfile
index f86bcb6..4eb85fb 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,9 @@
 # Build the manager binary
 FROM golang:1.12.5 as builder
 
+ENV DEBIAN_FRONTEND=noninteractive
+RUN apt-get update && apt-get upgrade -y && apt clean
+
 WORKDIR /workspace
 
 #ENV http_proxy=http://defraprx-fihelprx.glb.nsn-net.net:8080