diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
new file mode 100644
index 0000000..c03b617
--- /dev/null
+++ b/.devcontainer/Dockerfile
@@ -0,0 +1,6 @@
+# Standardized to approved base image - using Ubuntu 22.04 LTS
+FROM ubuntu:22.04
+
+# use this Dockerfile to install additional tools you might need, e.g.
+# RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
+#     && apt-get -y install --no-install-recommends <your-package-list-here>
diff --git a/Dockerfile b/Dockerfile
index df8f635..1e7e246 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,5 @@
-FROM ruby:3.1.1-alpine3.15
+# Standardized to approved base image - updated to latest stable Ruby on Alpine
+FROM ruby:3.3.6-alpine3.21
 
 RUN apk add --update build-base bash git bash-completion libffi-dev tzdata postgresql-client postgresql-dev nodejs npm yarn