diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
index a41b687..7ccda5a 100644
--- a/.github/workflows/docker-build.yml
+++ b/.github/workflows/docker-build.yml
@@ -39,7 +39,7 @@ jobs:
           password: ${{ secrets.DOCKER_PASSWORD }}
 
       - name: Build and push
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: ./${{ matrix.image }}
           push: ${{ github.event_name != 'pull_request' }}
@@ -70,7 +70,7 @@ jobs:
           password: ${{ secrets.DOCKER_PASSWORD }}
 
       - name: Build and push
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: ./${{ matrix.image }}
           push: ${{ github.event_name != 'pull_request' }}
@@ -103,7 +103,7 @@ jobs:
           password: ${{ secrets.DOCKER_PASSWORD }}
 
       - name: Build and push
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: ./${{ matrix.image }}
           push: ${{ github.event_name != 'pull_request' }}
@@ -134,7 +134,7 @@ jobs:
           password: ${{ secrets.DOCKER_PASSWORD }}
 
       - name: Build and push
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: ./${{ matrix.image }}
           push: ${{ github.event_name != 'pull_request' }}
diff --git a/.github/workflows/rails-docker-build.yml b/.github/workflows/rails-docker-build.yml
index 420abeb..4f8fc5d 100644
--- a/.github/workflows/rails-docker-build.yml
+++ b/.github/workflows/rails-docker-build.yml
@@ -49,7 +49,7 @@ jobs:
             type=raw,value=latest,enable=${{ matrix.is-latest == true }}
 
       - name: Build and push
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: ./rails/${{ matrix.rails-version }}
           push: ${{ github.event_name != 'pull_request' }}
diff --git a/rails/6/Dockerfile b/rails/6/Dockerfile
index de50ada..dc0349a 100644
--- a/rails/6/Dockerfile
+++ b/rails/6/Dockerfile
@@ -1,14 +1,14 @@
-FROM alpine:3.16
+FROM alpine:3.21
 
+# Install required packages including OpenSSL
 RUN apk add --no-cache \
   bash make nodejs gcc g++ libc-dev git ruby libxml2-dev libxslt-dev \
-  libffi-dev yaml-dev openssl-dev zlib-dev readline-dev linux-headers \
+  libffi-dev yaml-dev openssl openssl-dev zlib-dev readline-dev linux-headers \
   && mkdir -p /usr/src/app \
   && git clone https://github.com/postmodern/ruby-install /usr/src/ruby-install \
   && cd /usr/src/ruby-install \
   && make install \
-  && ruby-install --system ruby 3.0.6 -- --disable-install-rdoc \
-  --with-openssl-dir=/usr \
+  && ruby-install --system ruby 3.1.2 -- --disable-install-rdoc --with-openssl-dir=/usr \
   && gem install 'bundler:2.2.33' 'rails:6.1.7.10' \
   && bundle config --global build.nokogiri --use-system-libraries \
   && apk del ruby \
@@ -25,4 +25,4 @@ ONBUILD COPY . /usr/src/app
 
 EXPOSE 3000/tcp
 
-CMD ["bundle", "exec", "rails", "server", "-b", "0.0.0.0"] 
\ No newline at end of file
+CMD ["bundle", "exec", "rails", "server", "-b", "0.0.0.0"]
\ No newline at end of file
diff --git a/rails/7/Dockerfile b/rails/7/Dockerfile
index 9c0b799..92e7456 100644
--- a/rails/7/Dockerfile
+++ b/rails/7/Dockerfile
@@ -1,14 +1,14 @@
 FROM alpine:3.21
 
+# Install required packages including OpenSSL
 RUN apk add --no-cache \
   bash make nodejs gcc g++ libc-dev git ruby libxml2-dev libxslt-dev \
-  libffi-dev yaml-dev openssl-dev zlib-dev readline-dev linux-headers \
+  libffi-dev yaml-dev openssl openssl-dev zlib-dev readline-dev linux-headers \
   && mkdir -p /usr/src/app \
   && git clone https://github.com/postmodern/ruby-install /usr/src/ruby-install \
   && cd /usr/src/ruby-install \
   && make install \
-  && ruby-install --system ruby 3.3.0 -- --disable-install-rdoc \
-  --with-openssl-dir=/usr \
+  && ruby-install --system ruby 3.3.0 -- --disable-install-rdoc --with-openssl-dir=/usr \
   && gem install 'bundler:2.5.6' 'rails:7.2.2.1' \
   && bundle config --global build.nokogiri --use-system-libraries \
   && apk del ruby \
@@ -25,4 +25,4 @@ ONBUILD COPY . /usr/src/app
 
 EXPOSE 3000/tcp
 
-CMD ["bundle", "exec", "rails", "server", "-b", "0.0.0.0"] 
\ No newline at end of file
+CMD ["bundle", "exec", "rails", "server", "-b", "0.0.0.0"]
\ No newline at end of file
diff --git a/rails/8/Dockerfile b/rails/8/Dockerfile
index 61d7eae..70025c2 100644
--- a/rails/8/Dockerfile
+++ b/rails/8/Dockerfile
@@ -1,14 +1,14 @@
 FROM alpine:3.21
 
+# Install required packages including OpenSSL
 RUN apk add --no-cache \
   bash make nodejs gcc g++ libc-dev git ruby libxml2-dev libxslt-dev \
-  libffi-dev yaml-dev openssl-dev zlib-dev readline-dev linux-headers \
+  libffi-dev yaml-dev openssl openssl-dev zlib-dev readline-dev linux-headers \
   && mkdir -p /usr/src/app \
   && git clone https://github.com/postmodern/ruby-install /usr/src/ruby-install \
   && cd /usr/src/ruby-install \
   && make install \
-  && ruby-install --system ruby 3.3.0 -- --disable-install-rdoc \
-  --with-openssl-dir=/usr \
+  && ruby-install --system ruby 3.3.0 -- --disable-install-rdoc --with-openssl-dir=/usr \
   && gem install 'bundler:2.5.6' 'rails:8.0.2' \
   && bundle config --global build.nokogiri --use-system-libraries \
   && apk del ruby \
@@ -25,4 +25,4 @@ ONBUILD COPY . /usr/src/app
 
 EXPOSE 3000/tcp
 
-CMD ["bundle", "exec", "rails", "server", "-b", "0.0.0.0"] 
\ No newline at end of file
+CMD ["bundle", "exec", "rails", "server", "-b", "0.0.0.0"]
\ No newline at end of file