diff --git a/.github/workflows/build-container.yml b/.github/workflows/build-container.yml
index 6255a0b249..a78e566e65 100644
--- a/.github/workflows/build-container.yml
+++ b/.github/workflows/build-container.yml
@@ -46,7 +46,9 @@ jobs:
         id: meta
         uses: docker/metadata-action@v5
         with:
-          images: ${{ github.repository }}
+          images: |
+            docker.io/${{ github.repository }}
+            ghcr.io/${{ github.repository }}
           flavor: |
             latest=false
           tags: |
diff --git a/Dockerfile b/Dockerfile
index de1ab83000..fe0a303322 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -67,7 +67,7 @@ HEALTHCHECK --start-period=3s CMD [ "curl", "--fail", "http://localhost/healthch
 ################### Development Server
 FROM server AS develop
 
-ENV COLUMNS="${COLUMNS:-120}"
+ENV COLUMNS=120
 ENV PLACK_ENV=development
 
 USER root