diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 2e4a9eab..28c05627 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -3,7 +3,7 @@ name: build-and-push-docker-images
 on:
   workflow_dispatch:
   push:
-    branches: ["master"]
+    tags: ['*']
 
 jobs:
   build-and-push:
@@ -29,4 +29,4 @@ jobs:
         uses: docker/build-push-action@0a97817b6ade9f46837855d676c4cca3a2471fc9 # v4
         with:
           push: true
-          tags: ghcr.io/tryriot/smokescreen:latest
+          tags: ghcr.io/tryriot/smokescreen:${{ github.ref_name }},ghcr.io/tryriot/smokescreen:latest
diff --git a/Dockerfile b/Dockerfile
index b59f320a..5056971c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -42,9 +42,18 @@ ENV DD_HOSTNAME=smokescreen-container
 
 RUN echo '#!/bin/bash' > /start.sh && \
     echo 'export DD_HOSTNAME=${DD_HOSTNAME:-$(hostname)}' >> /start.sh && \
-    echo '/opt/datadog-agent/bin/agent/agent run > /dev/null 2>&1 &' >> /start.sh && \
+    echo 'mkdir -p /etc/datadog-agent/conf.d/smokescreen.d' >> /start.sh && \
+    echo 'cat > /etc/datadog-agent/conf.d/smokescreen.d/conf.yaml << EOF' >> /start.sh && \
+    echo 'logs:' >> /start.sh && \
+    echo '  - type: file' >> /start.sh && \
+    echo '    path: "/var/log/smokescreen/smokescreen.log"' >> /start.sh && \
+    echo '    service: "smokescreen"' >> /start.sh && \
+    echo '    source: "go"' >> /start.sh && \
+    echo 'EOF' >> /start.sh && \
+    echo '/opt/datadog-agent/bin/agent/agent run &' >> /start.sh && \
     echo 'sleep 2' >> /start.sh && \
-    echo 'exec ./smokescreen --statsd-address localhost:8125 ' >> /start.sh && \
+    echo 'mkdir -p /var/log/smokescreen' >> /start.sh && \
+    echo 'exec ./smokescreen --statsd-address localhost:8125 >> /var/log/smokescreen/smokescreen.log 2>&1' >> /start.sh && \
     chmod +x /start.sh
 
 CMD ["/start.sh"]