diff --git a/.github/workflows/build-cflinuxfs3-dev-image.yml b/.github/workflows/build-cflinuxfs3-dev-image.yml
new file mode 100644
index 000000000..c8ca62ad3
--- /dev/null
+++ b/.github/workflows/build-cflinuxfs3-dev-image.yml
@@ -0,0 +1,35 @@
+name: Build cflinuxfs3-dev docker image
+
+on:
+  workflow_dispatch: { }
+  schedule:
+    - cron: "0 1 * * 1"
+  push:
+    branches: [ master ]
+    paths: [ dockerfiles/cflinuxfs3-dev.Dockerfile ]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+
+      - name: Login to DockerHub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.CF_BUILDPACKS_DOCKERHUB_USERNAME }}
+          password: ${{ secrets.CF_BUILDPACKS_DOCKERHUB_TOKEN }}
+
+      - name: Build and push
+        uses: docker/build-push-action@v4
+        with:
+          context: .
+          push: true
+          tags: cfbuildpacks/cflinuxfs3-dev
+          file: dockerfiles/cflinuxfs3-dev.Dockerfile
diff --git a/dockerfiles/cflinuxfs3-dev.Dockerfile b/dockerfiles/cflinuxfs3-dev.Dockerfile
new file mode 100644
index 000000000..23455a59e
--- /dev/null
+++ b/dockerfiles/cflinuxfs3-dev.Dockerfile
@@ -0,0 +1,8 @@
+FROM cloudfoundry/cflinuxfs3
+
+RUN apt update
+
+# Remove ESM packages required for dependenciees
+
+## PHP
+RUN apt remove libonig4 -y
diff --git a/pipelines/dependency-builds.yml.erb b/pipelines/dependency-builds.yml.erb
index b7aeb11b4..df759c451 100644
--- a/pipelines/dependency-builds.yml.erb
+++ b/pipelines/dependency-builds.yml.erb
@@ -148,6 +148,11 @@ resources:
   source: {repository: cloudfoundry/<%= stack %>}
 <% end %>
 
+- name: cflinuxfs3-dev-image
+  type: docker-image
+  source:
+    repository: cfbuildpacks/cflinuxfs3-dev
+
 <% dependencies.values.map{|dep| dep['buildpacks'].keys}.flatten.uniq.each do |buildpack|
 branch = 'develop'
 private_key = '((cf-buildpacks-eng-github-ssh-key.private_key))'
@@ -328,6 +333,9 @@ version_lines = dep['buildpacks'].values.reduce([]) {|sum, bp| sum | get_version
 
   <%
   specific_stack = cflinuxfs4_build_dependencies.include?(dep_name.downcase) ? stacks : [stacks.last]
+  if dep_name.downcase == 'php'
+    specific_stack = specific_stack - ['cflinuxfs3'] + ['cflinuxfs3-dev']
+  end
   %>
 - name: build-<%= dep_name.downcase %>-<%= line.downcase %>
   serial: true
@@ -365,7 +373,7 @@ version_lines = dep['buildpacks'].values.reduce([]) {|sum, bp| sum | get_version
         params:
           STACK: <%= stack %>
       - in_parallel:
-    <% if !dep['third_party_hosted'] %>
+    <% unless dep['third_party_hosted'] %>
         - put: buildpacks-bucket-<%= dep_name %>-<%= stack %>
           resource: buildpacks-bucket-<%= dep_name %>
           params: