diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index d808aa3..7579e70 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -50,11 +50,11 @@ jobs:
         run: docker build . --file Dockerfile --tag $IMAGE_NAME
 
       - name: Log into registry
-        run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login docker.pkg.github.com -u ${{ github.actor }} --password-stdin
+        run: echo "${{ secrets.CR_PAT }}" | docker login ghcr.io -u ${{ github.actor }} --password-stdin
 
       - name: Push image
         run: |
-          IMAGE_ID=docker.pkg.github.com/${{ github.repository }}/$IMAGE_NAME
+          IMAGE_ID=ghcr.io/${{ github.repository }}
 
           # Change all uppercase to lowercase
           IMAGE_ID=$(echo $IMAGE_ID | tr '[A-Z]' '[a-z]')
@@ -66,7 +66,7 @@ jobs:
           [[ "${{ github.ref }}" == "refs/tags/"* ]] && VERSION=$(echo $VERSION | sed -e 's/^v//')
 
           # Use Docker `latest` tag convention
-          [ "$VERSION" == "master" ] && VERSION=latest
+          [ "$VERSION" == "main" ] && VERSION=latest
 
           echo IMAGE_ID=$IMAGE_ID
           echo VERSION=$VERSION
diff --git a/Dockerfile b/Dockerfile
index facee22..adea9fc 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,12 +5,12 @@ RUN apt-get update \
 	&& apt-get install -y -qq jq \
 	&& apt-get clean \
 	&& pip install awscli \
-    && pip install awsebcli --upgrade --user \
+    && pip install awsebcli --upgrade \
     && curl -o /usr/local/bin/ecs-cli https://s3.amazonaws.com/amazon-ecs-cli/ecs-cli-linux-amd64-latest \
     && chmod +x /usr/local/bin/ecs-cli
 
 # Configure the local bins
-ENV PATH="~/.local/bin:${PATH}"
+ENV PATH="/root/.local/bin:${PATH}"
 
 # Install Docker
 RUN curl -sSL https://get.docker.com/ | sh