diff --git a/.github/workflows/pr-smoke-test-fake-backend-images.yml b/.github/workflows/pr-smoke-test-fake-backend-images.yml
new file mode 100644
index 0000000000..6d468a6dd1
--- /dev/null
+++ b/.github/workflows/pr-smoke-test-fake-backend-images.yml
@@ -0,0 +1,71 @@
+name: PR build fake backend images for smoke tests
+
+on:
+  pull_request:
+    paths:
+      - 'smoke-tests/fake-backend/**'
+      - '.github/workflows/pr-smoke-test-fake-backend-images.yml'
+
+jobs:
+  buildLinux:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2.3.4
+        with:
+          fetch-depth: 0
+
+      - name: Set up JDK 11 for running Gradle
+        uses: actions/setup-java@v2
+        with:
+          distribution: adopt
+          java-version: 11
+
+      - name: Cache gradle dependencies
+        uses: burrunan/gradle-cache-action@v1.10
+        with:
+          job-id: fakebackend-smoke
+          read-only: true
+
+      - name: Cache Gradle Wrapper
+        uses: actions/cache@v2
+        with:
+          path: ~/.gradle/wrapper
+          key: ${{ runner.os }}-gradle-wrapper-cache-${{ hashFiles('smoke-tests/fake-backend/gradle/wrapper/gradle-wrapper.properties') }}
+
+      - name: Build Docker Image
+        run: ./gradlew jibDockerBuild -Djib.httpTimeout=120000 -Djib.console=plain
+        working-directory: smoke-tests/fake-backend
+
+  buildWindows:
+    runs-on: windows-latest
+    defaults:
+      run:
+        shell: bash
+    steps:
+      - name: Support longpaths
+        run: git config --system core.longpaths true
+
+      - uses: actions/checkout@v2.3.4
+        with:
+          fetch-depth: 0
+
+      - name: Set up JDK 11 for running Gradle
+        uses: actions/setup-java@v2
+        with:
+          distribution: adopt
+          java-version: 11
+
+      - name: Cache gradle dependencies
+        uses: burrunan/gradle-cache-action@v1.10
+        with:
+          job-id: fakebackend-smoke
+
+      - name: Cache Gradle Wrapper
+        uses: actions/cache@v2
+        with:
+          path: ~/.gradle/wrapper
+          key: ${{ runner.os }}-gradle-wrapper-cache-${{ hashFiles('smoke-tests/fake-backend/gradle/wrapper/gradle-wrapper.properties') }}
+
+      - name: Build Docker Image
+        run: ./gradlew windowsBackendImageBuild windowsCollectorImageBuild
+        working-directory: smoke-tests/fake-backend
diff --git a/.github/workflows/pr-smoke-test-grpc-images.yml b/.github/workflows/pr-smoke-test-grpc-images.yml
new file mode 100644
index 0000000000..b9bba092db
--- /dev/null
+++ b/.github/workflows/pr-smoke-test-grpc-images.yml
@@ -0,0 +1,40 @@
+name: PR build gRPC images for smoke tests
+
+on:
+  pull_request:
+    paths:
+      - 'smoke-tests/grpc/**'
+      - '.github/workflows/pr-smoke-test-grpc-images.yml'
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2.3.4
+        with:
+          fetch-depth: 0
+
+      - name: Set up JDK 11 for running Gradle
+        uses: actions/setup-java@v2
+        with:
+          distribution: adopt
+          java-version: 11
+
+      - name: Cache gradle dependencies
+        uses: burrunan/gradle-cache-action@v1.10
+        with:
+          job-id: grpc-smoke
+          read-only: true
+
+      - name: Cache Gradle Wrapper
+        uses: actions/cache@v2
+        with:
+          path: ~/.gradle/wrapper
+          key: ${{ runner.os }}-gradle-wrapper-cache-${{ hashFiles('smoke-tests/grpc/gradle/wrapper/gradle-wrapper.properties') }}
+
+      - name: Build Docker Image
+        run: |
+          ./gradlew jibDockerBuild -PtargetJDK=8 -Djib.httpTimeout=120000 -Djib.console=plain --stacktrace
+          ./gradlew jibDockerBuild -PtargetJDK=11 -Djib.httpTimeout=120000 -Djib.console=plain --stacktrace
+          ./gradlew jibDockerBuild -PtargetJDK=16 -Djib.httpTimeout=120000 -Djib.console=plain --stacktrace
+        working-directory: smoke-tests/grpc
diff --git a/.github/workflows/pr-smoke-test-play-images.yml b/.github/workflows/pr-smoke-test-play-images.yml
new file mode 100644
index 0000000000..28f52cdcd2
--- /dev/null
+++ b/.github/workflows/pr-smoke-test-play-images.yml
@@ -0,0 +1,42 @@
+name: PR build Play images for smoke tests
+
+on:
+  pull_request:
+    paths:
+      - 'smoke-tests/play/**'
+      - '.github/workflows/pr-smoke-test-play-images.yml'
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2.3.4
+        with:
+          fetch-depth: 0
+
+      - name: Set up JDK 11 for running Gradle
+        uses: actions/setup-java@v2
+        with:
+          distribution: adopt
+          java-version: 11
+
+      - name: Cache gradle dependencies
+        uses: burrunan/gradle-cache-action@v1.10
+        with:
+          job-id: play-smoke
+          read-only: true
+
+      - name: Cache Gradle Wrapper
+        uses: actions/cache@v2
+        with:
+          path: ~/.gradle/wrapper
+          key: ${{ runner.os }}-gradle-wrapper-cache-${{ hashFiles('smoke-tests/play/gradle/wrapper/gradle-wrapper.properties') }}
+
+      - name: Build Docker Image
+        run: |
+          ./gradlew jibDockerBuild -PtargetJDK=8 -Djib.httpTimeout=120000 -Djib.console=plain
+          ./gradlew jibDockerBuild -PtargetJDK=11 -Djib.httpTimeout=120000 -Djib.console=plain
+          # Play doesn't support Java 16 (or 17) yet
+          # https://github.com/playframework/playframework/pull/10819
+          ./gradlew jibDockerBuild -PtargetJDK=15 -Djib.httpTimeout=120000 -Djib.console=plain
+        working-directory: smoke-tests/play
diff --git a/.github/workflows/pr-smoke-test-spring-boot-images.yml b/.github/workflows/pr-smoke-test-spring-boot-images.yml
new file mode 100644
index 0000000000..38a974f97b
--- /dev/null
+++ b/.github/workflows/pr-smoke-test-spring-boot-images.yml
@@ -0,0 +1,40 @@
+name: PR build Spring Boot images for smoke tests
+
+on:
+  pull_request:
+    paths:
+      - 'smoke-tests/springboot/**'
+      - '.github/workflows/pr-smoke-test-spring-boot-images.yml'
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2.3.4
+        with:
+          fetch-depth: 0
+
+      - name: Set up JDK 11 for running Gradle
+        uses: actions/setup-java@v2
+        with:
+          distribution: adopt
+          java-version: 11
+
+      - name: Cache gradle dependencies
+        uses: burrunan/gradle-cache-action@v1.10
+        with:
+          job-id: springboot-smoke
+          read-only: true
+
+      - name: Cache Gradle Wrapper
+        uses: actions/cache@v2
+        with:
+          path: ~/.gradle/wrapper
+          key: ${{ runner.os }}-gradle-wrapper-cache-${{ hashFiles('smoke-tests/springboot/gradle/wrapper/gradle-wrapper.properties') }}
+
+      - name: Build Docker Image
+        run: |
+          ./gradlew jibDockerBuild -PtargetJDK=8 -Djib.httpTimeout=120000 -Djib.console=plain --stacktrace
+          ./gradlew jibDockerBuild -PtargetJDK=11 -Djib.httpTimeout=120000 -Djib.console=plain --stacktrace
+          ./gradlew jibDockerBuild -PtargetJDK=16 -Djib.httpTimeout=120000 -Djib.console=plain --stacktrace
+        working-directory: smoke-tests/springboot