diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index 614d0d0..5a61cee 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -18,17 +18,18 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
-    - name: Set up JDK 11
-      uses: actions/setup-java@v3
-      with:
-        java-version: '11'
-        distribution: 'adopt-hotspot'
-        cache: 'gradle'
-    - name: Grant execute permission for gradlew
-      run: chmod +x gradlew
-    - name: Build and test
-      uses: gradle/gradle-build-action@v2.2.1
-      with:
-        gradle-version: 'wrapper'
-        arguments: test
+      - uses: actions/checkout@v3
+      - name: Set up JDK 11
+        uses: actions/setup-java@v3
+        with:
+          java-version: '11'
+          distribution: 'adopt-hotspot'
+          cache: 'gradle'
+      - uses: gradle/wrapper-validation-action@v1
+      - name: Grant execute permission for gradlew
+        run: chmod +x gradlew
+      - name: Build and test
+        uses: gradle/gradle-build-action@v2.2.1
+        with:
+          gradle-version: 'wrapper'
+          arguments: test
diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml
index b68d391..24abe3f 100644
--- a/.github/workflows/create-release.yml
+++ b/.github/workflows/create-release.yml
@@ -42,6 +42,7 @@ jobs:
           java-version: '11'
           distribution: 'adopt-hotspot'
           cache: 'gradle'
+      - uses: gradle/wrapper-validation-action@v1
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
       - name: Build and test
diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml
deleted file mode 100644
index 405a2b3..0000000
--- a/.github/workflows/gradle-wrapper-validation.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-name: "Validate Gradle Wrapper"
-on: [push, pull_request]
-
-jobs:
-  validation:
-    name: "Validation"
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - uses: gradle/wrapper-validation-action@v1
diff --git a/.github/workflows/release-container-image.yml b/.github/workflows/release-container-image.yml
index 640fff4..2c1e989 100644
--- a/.github/workflows/release-container-image.yml
+++ b/.github/workflows/release-container-image.yml
@@ -21,6 +21,7 @@ jobs:
           java-version: '11'
           distribution: 'adopt-hotspot'
           cache: 'gradle'
+      - uses: gradle/wrapper-validation-action@v1
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
       - name: Build and test
diff --git a/.github/workflows/release-dev-container-image.yml b/.github/workflows/release-dev-container-image.yml
index 052b773..43676bb 100644
--- a/.github/workflows/release-dev-container-image.yml
+++ b/.github/workflows/release-dev-container-image.yml
@@ -21,6 +21,7 @@ jobs:
           java-version: '11'
           distribution: 'adopt-hotspot'
           cache: 'gradle'
+      - uses: gradle/wrapper-validation-action@v1
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
       - name: Build project and install Distribution package