diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 0000000..1230149
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,6 @@
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "daily"
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 9ddd994..be4a459 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -2,26 +2,32 @@
 name: main
 
 on:
-  push:
-    tags:
-      - '*'
+  release:
+    types:
+      - published
 
 jobs:
   build:
-    runs-on:
-      - ubuntu-latest
+    runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3.3.0
+
       - name: Login to DockerHub
-        uses: docker/login-action@v1
+        uses: docker/login-action@v2.1.0
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Generate image tag
+        id: image_tag
+        run: |
+          echo ::set-output name=tag::$(echo ${{ github.event.release.tag_name }} | sed 's/^v//')
+
       - name: Build && Push
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v3.2.0
         with:
           context: .
           file: Dockerfile.base
-          tags: t42x/awxkit_base:${{ github.ref_name }}
+          tags: t42x/awxkit_base:${{ steps.image_tag.outputs.tag }}
           push: true
diff --git a/Dockerfile b/Dockerfile
index dc5b912..f5db378 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM t42x/awxkit_base:v1
+FROM t42x/awxkit_base:v21.10.2
 
 ADD entrypoint.sh /entrypoint.sh
 RUN chmod +x /entrypoint.sh
diff --git a/requirements.txt b/requirements.txt
index 06dd0fc..2ff4362 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1 +1 @@
-awxkit==19.4.0
+awxkit==21.10.2