diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index a01a9c52..4fb206d9 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -51,7 +51,7 @@ jobs:
           npm install -g yarn
       - name: Clone client
         run: |
-          git clone https://github.com/swing-opensource/swingmusic-client.git
+          git clone https://github.com/cwilvx/swingmusic-client.git
       - name: Install dependencies & Build client
         run: |
           cd swingmusic-client
@@ -160,18 +160,16 @@ jobs:
         with:
           # list of Docker images to use as base name for tags
           images: |
-            ghcr.io/swing-opensource/swingmusic
+            ghcr.io/${{ github.repository }}
       - name: Build and push
         uses: docker/build-push-action@v2
         with:
           context: .
           platforms: linux/amd64,linux/arm, linux/arm64
           push: true
-          tags: ghcr.io/swing-opensource/swingmusic:${{inputs.tag}}, ${{env.LATEST_TAG}}
+          tags: ghcr.io/${{github.repository}}:${{inputs.tag}}, ${{env.LATEST_TAG}}
           labels: org.opencontainers.image.title=Docker
           build-args: |
             --provenance=false
         env:
-          LATEST_TAG: ${{ inputs.is_latest == 'true' && format('ghcr.io/{0}:latest', 'swing-opensource/swingmusic') || '' }}
-
-          # TODO: REPLACE SWING-OPENSWINGMUSIC WITH github.repository in Docker meta step and following steps
\ No newline at end of file
+          LATEST_TAG: ${{ inputs.is_latest == 'true' && format('ghcr.io/{0}:latest', github.repository) || '' }}
diff --git a/Dockerfile b/Dockerfile
index a091d596..f193e267 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -13,3 +13,7 @@ VOLUME /music
 VOLUME /config
 
 ENTRYPOINT ["/swingmusic", "--host", "0.0.0.0", "--config", "/config"]
+
+LABEL org.opencontainers.image.source=https://github.com/cwilvx/swingmusic
+LABEL org.opencontainers.image.description=" Swing Music is a beautiful, self-hosted music player for your local audio files. Like a cooler Spotify ... but bring your own music."
+LABEL org.opencontainers.image.licenses=MIT
\ No newline at end of file