diff --git a/Dockerfile b/Dockerfile
index 38b810f..99787ca 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,9 +1,14 @@
 # Base image for building the application
-FROM gradle:7.6.0-jdk21 AS build
+FROM gradle:latest AS build
 
 # Set the working directory
 WORKDIR /app
 
+# Declare build arguments
+ARG OAUTH2_CLIENT_GITHUB_ID
+ARG OAUTH2_CLIENT_GITHUB_SECRET
+ARG JWT_SECRET
+
 # Copy the build.gradle.kts and settings.gradle.kts files
 COPY build.gradle.kts settings.gradle.kts ./
 
@@ -14,7 +19,7 @@ COPY src ./src
 RUN gradle build --no-daemon
 
 # Base image for running the application
-FROM openjdk:21-jre-slim
+FROM openjdk:21
 
 # Set the working directory
 WORKDIR /app
@@ -22,6 +27,11 @@ WORKDIR /app
 # Copy the built JAR file from the build stage
 COPY --from=build /app/build/libs/*.jar app.jar
 
+# Declare environment variables for runtime
+ENV OAUTH2_CLIENT_GITHUB_ID=$OAUTH2_CLIENT_GITHUB_ID
+ENV OAUTH2_CLIENT_GITHUB_SECRET=$OAUTH2_CLIENT_GITHUB_SECRET
+ENV JWT_SECRET=$JWT_SECRET
+
 # Expose the application port
 EXPOSE 8180