diff --git a/src/api/dev.Dockerfile b/src/api/dev.Dockerfile
index e286c78..59eebb1 100644
--- a/src/api/dev.Dockerfile
+++ b/src/api/dev.Dockerfile
@@ -33,5 +33,8 @@ RUN go mod download && go mod vendor
 
 # Repository mounted to the container
 WORKDIR /gohan-api/src/api
+COPY entrypoint.bash .
+COPY run.dev.bash .
 
-CMD [ "air" ]
+ENTRYPOINT [ "bash", "./entrypoint.bash" ]
+CMD [ "bash", "./run.dev.bash" ]
diff --git a/src/api/entrypoint.bash b/src/api/entrypoint.bash
new file mode 100644
index 0000000..b11103b
--- /dev/null
+++ b/src/api/entrypoint.bash
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+cd /gohan-api || exit
+
+# Create bento_user and home
+source /create_service_user.bash
+
+# Create dev build directory
+mkdir -p src/api/tmp
+
+# Set permissions / groups
+chown -R bento_user:bento_user ./
+chown -R bento_user:bento_user /app
+chmod -R o-rwx src/api/tmp
+
+# Drop into bento_user from root and execute the CMD specified for the image
+exec gosu bento_user "$@"
diff --git a/src/api/run.dev.bash b/src/api/run.dev.bash
new file mode 100644
index 0000000..4a39087
--- /dev/null
+++ b/src/api/run.dev.bash
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+# Set .gitconfig for development
+/set_gitconfig.bash
+
+# Start gohan-api with hot reload using Air
+air