diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
index 51df22a5..2b1aca0b 100644
--- a/.github/workflows/docker-build.yml
+++ b/.github/workflows/docker-build.yml
@@ -21,11 +21,15 @@ jobs:
             registry.sweetrpg.com/sweetrpg-library-api
           tags: |
             type=raw,value=latest
-            type=ref,event=branch
-            type=ref,event=tag
-            type=semver,pattern={{version}}
-            type=semver,pattern={{major}}.{{minor}}
-            type=semver,pattern={{major}}
+            type=ref,enable=true,event=branch
+            type=ref,enable=true,event=tag
+            type=semver,enable=true,pattern={{version}}
+            type=semver,enable=true,pattern={{major}}.{{minor}}
+            type=semver,enable=true,pattern={{major}}
+            type=raw,pattern={{version}}
+            type=raw,pattern={{major}}.{{minor}}
+            type=raw,pattern={{major}}
+            type=sha,prefix={{branch}}-
             type=sha
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v1
diff --git a/src/sweetrpg_library_api/application/main.py b/src/sweetrpg_library_api/application/main.py
index 793e7e3c..b92d5fe7 100644
--- a/src/sweetrpg_library_api/application/main.py
+++ b/src/sweetrpg_library_api/application/main.py
@@ -136,9 +136,6 @@ def create_app(app_name=constants.APPLICATION_NAME):
 
     app.register_blueprint(health_blueprint, url_prefix="/health")
 
-    # from application.blueprints.billing import blueprint as billing_blueprint
-    # app.register_blueprint(billing_blueprint, url_prefix="/billing")
-
     app.logger.info("Setting up database...")
     from sweetrpg_library_api.application.db import db
     # print(db)