diff --git a/.github/workflows/build-image.yml b/.github/workflows/build-image.yml
index 32d8f2d0..319787e7 100644
--- a/.github/workflows/build-image.yml
+++ b/.github/workflows/build-image.yml
@@ -37,11 +37,12 @@ jobs:
             ;;
           esac
 
-      - name: Login to Docker Hub
+      - name: Login to registry
         uses: docker/login-action@v2
         with:
-          username: ${{ vars.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
         if: github.event_name != 'pull_request'
 
       - name: Build and push
@@ -54,4 +55,4 @@ jobs:
           context: .
           file: Containerfile
           push: ${{ github.event_name != 'pull_request' }}
-          tags: retrospring/retrospring:${{ env.RETROSPRING_VERSION }}
+          tags: ghcr.io/retrospring/retrospring:${{ env.RETROSPRING_VERSION }}
diff --git a/Containerfile b/Containerfile
index 2e740498..700b458e 100644
--- a/Containerfile
+++ b/Containerfile
@@ -2,6 +2,11 @@
 
 FROM registry.opensuse.org/opensuse/leap:15.4
 
+LABEL org.opencontainers.image.title="Retrospring (production)"
+LABEL org.opencontainers.image.description="Image containing everything to run Retrospring in production mode.  Do not use this for development."
+LABEL org.opencontainers.image.vendor="The Retrospring team"
+LABEL org.opencontainers.image.url="https://github.com/Retrospring/retrospring"
+
 ARG RETROSPRING_VERSION=2023.0131.1
 ARG RUBY_VERSION=3.1.2
 ARG RUBY_INSTALL_VERSION=0.9.0