diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml
index c5846e2..85953dc 100644
--- a/.github/workflows/deploy.yaml
+++ b/.github/workflows/deploy.yaml
@@ -90,3 +90,8 @@ jobs:
             org.opencontainers.image.version=${{ env.RELEASE_TAG }}
             org.opencontainers.image.title=amcrest2mqtt
             org.opencontainers.image.source=${{ github.repository }}
+            org.opencontainers.image.authors=weirdTangent <jeff@weirdtangent.com>
+            org.opencontainers.image.url=https://www.graystorm.com
+            org.opencontainers.image.documentation=https://github.com/${{ github.repository }}#readme
+            org.opencontainers.image.description=Publishes Amcrest camera events, snapshots, and status updates via MQTT for Home Assistant auto-discovery
+            org.opencontainers.image.licenses=MIT
diff --git a/docker-compose.yaml b/docker-compose.yaml
index f44bc49..87a4134 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -1,9 +1,23 @@
+version: "3.8"
+
 services:
   amcrest2mqtt:
     image: graystorm/amcrest2mqtt:latest
-    network_mode: host
     container_name: amcrest2mqtt
     restart: unless-stopped
+    network_mode: host
     volumes:
-      - /volume1/docker/amcrest2mqtt/config:/config
+      - ./config:/config
+    environment:
+      - TZ=${TZ:-UTC}
+      - CONFIG_PATH=/config/config.yaml
+    labels:
+      org.opencontainers.image.title: "amcrest2mqtt"
+      org.opencontainers.image.description: "Publishes Amcrest camera events and states via MQTT"
+      org.opencontainers.image.source: "https://github.com/weirdtangent/amcrest2mqtt"
+      org.opencontainers.image.documentation: "https://github.com/weirdtangent/amcrest2mqtt#readme"
+      org.opencontainers.image.licenses: "MIT"
+      org.opencontainers.image.version: "${AMCREST2MQTT_TAG:-latest}"
+      org.opencontainers.image.authors: "weirdTangent <jeff@weirdtangent.com>"
+      org.opencontainers.image.url: "https://www.graystorm.com"