diff --git a/.gitignore b/.gitignore
index 4d65d8cf0b..458065e062 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,3 +20,5 @@ atlantis.env
 # gitreleaser
 dist/
 tmp-CHANGELOG.md
+
+.envrc
diff --git a/Dockerfile b/Dockerfile
index 852bb432e4..26f3607dc3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 # Stage 1: build artifact
-FROM golang:1.19.3-alpine AS builder
+FROM golang:1.19.4-alpine AS builder
 
 WORKDIR /app
 COPY . /app
@@ -8,7 +8,7 @@ RUN --mount=type=cache,target=/go/pkg/mod \
     CGO_ENABLED=0 go build -trimpath -ldflags "-s -w" -v -o atlantis .
 
 # Stage 2
-# The runatlantis/atlantis-base is created by docker-base/Dockerfile.
+# The runatlantis/atlantis-base is created by docker-base/Dockerfile
 FROM ghcr.io/runatlantis/atlantis-base:2022.12.05 AS base
 
 # Get the architecture the image is being built for
diff --git a/docker-base/Dockerfile b/docker-base/Dockerfile
index 3865690713..d7eafa319d 100644
--- a/docker-base/Dockerfile
+++ b/docker-base/Dockerfile
@@ -1,7 +1,7 @@
 # This Dockerfile builds our base image with gosu, dumb-init and the atlantis
 # user. We split this from the main Dockerfile because this base doesn't change
 # and also because it kept breaking the build due to flakiness.
-FROM alpine:3.16.3
+FROM alpine:3.17.0
 LABEL authors="Anubhav Mishra, Luke Kysow"
 
 # We use gosu to step down from root and run as the atlantis user so we need
@@ -26,19 +26,19 @@ ARG TARGETPLATFORM
 
 # Install packages needed for running Atlantis.
 RUN apk add --no-cache \
-        ca-certificates=20220614-r0 \
-        curl=7.83.1-r4 \
-        git=2.36.3-r0 \
-        unzip=6.0-r9 \
-        bash=5.1.16-r2 \
-        openssh=9.0_p1-r2 \
-        libcap=2.64-r0 \
-        dumb-init=1.2.5-r1 \
-        gcompat=1.0.0-r4 && \
+        ca-certificates=20220614-r2 \
+        curl=7.86.0-r1 \
+        git=2.38.1-r0 \
+        unzip=6.0-r13 \
+        bash=5.2.12-r0 \
+        openssh=9.1_p1-r1 \
+        libcap=2.66-r0 \
+        dumb-init=1.2.5-r2 \
+        gcompat=1.1.0-r0 && \
     # Install packages needed for building dependencies.
     apk add --no-cache --virtual .build-deps \
-        gnupg=2.2.35-r4 \
-        openssl=1.1.1s-r0 && \
+        gnupg=2.2.40-r0 \
+        openssl=3.0.7-r0 && \
     mkdir -p /tmp/build && \
     cd /tmp/build && \
     # git-lfs