diff --git a/hubot/Dockerfile b/hubot/Dockerfile
index a0cef17..072cd29 100644
--- a/hubot/Dockerfile
+++ b/hubot/Dockerfile
@@ -2,7 +2,7 @@
 # Dockerfile for hubot
 #
 
-FROM alpine:3
+FROM alpine:3.16
 MAINTAINER EasyPi Software Foundation
 
 ENV HUBOT_NAME=Hubot
@@ -11,9 +11,9 @@ ENV HUBOT_DESCRIPTION=$HUBOT_NAME-$HUBOT_ADAPTER
 ENV HUBOT_SLACK_TOKEN=
 
 RUN set -xe \
-    && apk add --update ca-certificates nodejs nodejs-npm python3 \
+    && apk add --update bash ca-certificates nodejs npm python3 \
     && npm install -g yo generator-hubot \
-    && adduser -s /bin/sh -D hubot
+    && adduser -s /bin/bash -D hubot
 
 USER hubot
 WORKDIR /home/hubot
@@ -35,7 +35,7 @@ RUN set -xe \
 
 VOLUME /home/hobot \
        /usr/local/bin \
-       /usr/lib/python3.8/site-packages
+       /usr/lib/python3.10/site-packages
 
 EXPOSE 8080
 
diff --git a/hubot/README.md b/hubot/README.md
index edc8b94..808852c 100644
--- a/hubot/README.md
+++ b/hubot/README.md
@@ -9,16 +9,18 @@ Hubot's power comes through [scripts][2].
 ## docker-compse.yml
 
 ```yaml
-hubot:
-  image: vimagick/hubot
-  ports:
-    - "8080:8080"
-  volumes:
-    - ./data:/home/hubot/scripts
-  environment:
-    - HUBOT_SLACK_TOKEN=xoxb-xxxxxxxxxxxx-xxxxxxxxxxxxxxxxxxxxxxxx
-    - HUBOT_AUTH_ADMIN=UXXXXXXXX
-  restart: always
+version: "3.8"
+services:
+  hubot:
+    image: vimagick/hubot
+    ports:
+      - "8080:8080"
+    volumes:
+      - ./data:/home/hubot/scripts
+    environment:
+      - HUBOT_SLACK_TOKEN=xoxb-xxxxxxxxxxx-xxxxxxxxxxxxxxxxxxxxxxxx
+      - HUBOT_AUTH_ADMIN=UXXXXXXXX
+    restart: unless-stopped
 ```
 
 - Click [this][3] to generate `HUBOT_SLACK_TOKEN`.
diff --git a/hubot/arm/Dockerfile b/hubot/arm/Dockerfile
deleted file mode 100644
index 8101981..0000000
--- a/hubot/arm/Dockerfile
+++ /dev/null
@@ -1,42 +0,0 @@
-#
-# Dockerfile for hubot-arm
-#
-
-FROM arm32v7/alpine:3
-MAINTAINER EasyPi Software Foundation
-
-ENV HUBOT_NAME=Hubot
-ENV HUBOT_ADAPTER=slack
-ENV HUBOT_DESCRIPTION=$HUBOT_NAME-$HUBOT_ADAPTER
-ENV HUBOT_SLACK_TOKEN=
-
-RUN set -xe \
-    && apk add --update ca-certificates nodejs nodejs-npm python3 \
-    && npm install -g yo generator-hubot \
-    && adduser -s /bin/sh -D hubot
-
-USER hubot
-WORKDIR /home/hubot
-
-RUN set -xe \
-    && yo hubot --name $HUBOT_NAME \
-                --description $HUBOT_DESCRIPTION \
-                --adapter $HUBOT_ADAPTER \
-                --defaults \
-    && npm install --save hubot-$HUBOT_ADAPTER \
-                          htmlparser \
-                          moment \
-                          querystring \
-                          soupselect \
-                          underscore \
-                          underscore.string \
-                          url \
-    && sed -i -r 's/^\s+#//' scripts/example.coffee
-
-VOLUME /home/hobot \
-       /usr/local/bin \
-       /usr/lib/python3.8/site-packages
-
-EXPOSE 8080
-
-CMD ["./bin/hubot", "--adapter", "slack"]
diff --git a/hubot/arm/docker-compose.yml b/hubot/arm/docker-compose.yml
deleted file mode 100644
index 00e0a44..0000000
--- a/hubot/arm/docker-compose.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-hubot:
-  image: easypi/hubot-arm
-  ports:
-    - "8080:8080"
-  volumes:
-    - ./data:/home/hubot/scripts
-  environment:
-    - HUBOT_SLACK_TOKEN=xoxb-xxxxxxxxxxx-xxxxxxxxxxxxxxxxxxxxxxxx
-    - HUBOT_AUTH_ADMIN=UXXXXXXXX
-  restart: unless-stopped
diff --git a/hubot/docker-compose.yml b/hubot/docker-compose.yml
index bd3fa98..4e875e0 100644
--- a/hubot/docker-compose.yml
+++ b/hubot/docker-compose.yml
@@ -1,10 +1,12 @@
-hubot:
-  image: vimagick/hubot
-  ports:
-    - "8080:8080"
-  volumes:
-    - ./data:/home/hubot/scripts
-  environment:
-    - HUBOT_SLACK_TOKEN=xoxb-xxxxxxxxxxx-xxxxxxxxxxxxxxxxxxxxxxxx
-    - HUBOT_AUTH_ADMIN=UXXXXXXXX
-  restart: unless-stopped
+version: "3.8"
+services:
+  hubot:
+    image: vimagick/hubot
+    ports:
+      - "8080:8080"
+    volumes:
+      - ./data:/home/hubot/scripts
+    environment:
+      - HUBOT_SLACK_TOKEN=xoxb-xxxxxxxxxxx-xxxxxxxxxxxxxxxxxxxxxxxx
+      - HUBOT_AUTH_ADMIN=UXXXXXXXX
+    restart: unless-stopped