diff --git a/modules/codebuild/codebuild_files/Dockerfile_serverless_wordpress b/modules/codebuild/codebuild_files/Dockerfile_serverless_wordpress
index 8b09544..9bb4669 100644
--- a/modules/codebuild/codebuild_files/Dockerfile_serverless_wordpress
+++ b/modules/codebuild/codebuild_files/Dockerfile_serverless_wordpress
@@ -1,12 +1,17 @@
 ARG aws_account_id
 ARG aws_region
 ARG ecr_repo_name
+ARG wp2static_version
+ARG wp2static_s3_addon_version
 
 FROM ${aws_account_id}.dkr.ecr.${aws_region}.amazonaws.com/${ecr_repo_name}:base
-COPY ["wp-cli.phar", "serverless-wordpress-wp2static.zip","serverless-wordpress-s3-addon.zip","/tmp/"]
+COPY ["wp-cli.phar", "/tmp/"]
 COPY docker-entrypoint.sh /usr/local/bin/
 RUN apt-get update && apt-get install -y sudo jq awscli mariadb-client && chmod +x /usr/local/bin/docker-entrypoint.sh && chmod +x /tmp/wp-cli.phar && mv /tmp/wp-cli.phar /usr/local/bin/wp \
 && rm -rf /var/lib/apt/lists/*
 
+RUN curl https://github.com/WP2Static/wp2static/archive/refs/tags/${wp2static_version}.zip -o /tmp/serverless-wordpress-wp2static.zip
+RUN curl https://github.com/leonstafford/wp2static-addon-s3/archive/refs/tags/${wp2static_s3_addon_version}.zip -o /tmp/serverless-wordpress-s3-addon.zip
+
 RUN mv "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini"
 COPY ["php.ini", "$PHP_INI_DIR/conf.d/"]
diff --git a/modules/codebuild/codebuild_files/buildspec.yml b/modules/codebuild/codebuild_files/buildspec.yml
index 5a181c7..dcdd872 100644
--- a/modules/codebuild/codebuild_files/buildspec.yml
+++ b/modules/codebuild/codebuild_files/buildspec.yml
@@ -21,7 +21,9 @@ phases:
         docker build -t $IMAGE_REPO_NAME:$IMAGE_TAG --build-arg
         aws_account_id=$AWS_ACCOUNT_ID --build-arg
         aws_region=$AWS_DEFAULT_REGION --build-arg
-        ecr_repo_name=$IMAGE_REPO_NAME -f Dockerfile_serverless_wordpress .
+        ecr_repo_name=$IMAGE_REPO_NAME --build-arg
+        wp2static_version=$WP2STATIC_VERSION --build-arg
+        wp2static_s3_addon_version=$WP2STATIC_S3_ADDON_VERSION  -f Dockerfile_serverless_wordpress .
       # yamllint disable-line rule:line-length
       - docker tag $IMAGE_REPO_NAME:$IMAGE_TAG $AWS_ACCOUNT_ID.dkr.ecr.$AWS_DEFAULT_REGION.amazonaws.com/$IMAGE_REPO_NAME:$IMAGE_TAG
   post_build:
diff --git a/modules/codebuild/codebuild_files/serverless-wordpress-s3-addon.zip b/modules/codebuild/codebuild_files/serverless-wordpress-s3-addon.zip
deleted file mode 100644
index a31de89..0000000
Binary files a/modules/codebuild/codebuild_files/serverless-wordpress-s3-addon.zip and /dev/null differ
diff --git a/modules/codebuild/codebuild_files/serverless-wordpress-wp2static.zip b/modules/codebuild/codebuild_files/serverless-wordpress-wp2static.zip
deleted file mode 100644
index cb76453..0000000
Binary files a/modules/codebuild/codebuild_files/serverless-wordpress-wp2static.zip and /dev/null differ
diff --git a/modules/codebuild/main.tf b/modules/codebuild/main.tf
index 3a8d1d4..d04ef20 100644
--- a/modules/codebuild/main.tf
+++ b/modules/codebuild/main.tf
@@ -129,6 +129,14 @@ resource "aws_codebuild_project" "wordpress_docker_build" {
       name  = "IMAGE_TAG"
       value = "latest"
     }
+    environment_variable {
+      name  = "WP2STATIC_VERSION"
+      value = var.wp2static_version
+    }
+    environment_variable {
+      name  = "WP2STATIC_S3_ADDON_VERSION"
+      value = var.wp2static_s3_addon_version
+    }
   }
 
   logs_config {
diff --git a/modules/codebuild/variables.tf b/modules/codebuild/variables.tf
index 3ed9ad1..4c338b3 100644
--- a/modules/codebuild/variables.tf
+++ b/modules/codebuild/variables.tf
@@ -63,3 +63,15 @@ variable "graviton_codebuild_enabled" {
   default     = false
   description = "Flag that controls whether CodeBuild should use Graviton-based build agents in [supported regions](https://docs.aws.amazon.com/codebuild/latest/userguide/build-env-ref-compute-types.html)."
 }
+
+variable "wp2static_version" {
+  type        = string
+  description = "Version of WP2Static to use from https://github.com/leonstafford/wp2static/releases"
+  default     = "7.1.7"
+}
+
+variable "wp2static_s3_addon_version" {
+  type        = string
+  description = "Version of the WP2Static S3 Add-on to use from https://github.com/leonstafford/wp2static-addon-s3/releases/"
+  default     = "1.0"
+}