diff --git a/.github/workflows/build-test-prValidation.yml b/.github/workflows/build-test-prValidation.yml
index d693b7d11a..e66343ff4e 100644
--- a/.github/workflows/build-test-prValidation.yml
+++ b/.github/workflows/build-test-prValidation.yml
@@ -11,6 +11,32 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
+  check-code-style:
+    name: Check / Code Style
+    runs-on: ubuntu-22.04
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3.1.0
+        with:
+          # we don't know what commit the last tag was it's safer to get entire repo so previousStableVersion resolves
+          fetch-depth: 0
+
+      - name: Cache Coursier cache
+        uses: coursier/cache-action@v6.4.0
+
+      - name: Setup Java 8
+        uses: actions/setup-java@v3
+        with:
+          distribution: temurin
+          java-version: 8
+
+      - name: Code style check
+        run: |-
+          cp .jvmopts-ci .jvmopts
+          sbt \
+          -Dsbt.override.build.repos=false \
+          -Dsbt.log.noformat=false \
+          javafmtCheckAll
   pull-request-validation:
     name: Check / Tests
     runs-on: ubuntu-20.04
diff --git a/build.sbt b/build.sbt
index 7a37cc6f39..1fa18f4d64 100644
--- a/build.sbt
+++ b/build.sbt
@@ -37,8 +37,8 @@ enablePlugins(
   JavaFormatterPlugin)
 disablePlugins(MimaPlugin)
 
-addCommandAlias("verifyCodeStyle", "scalafmtCheckAll; scalafmtSbtCheck; headerCheckAll")
-addCommandAlias("applyCodeStyle", "headerCreateAll; scalafmtAll; scalafmtSbt")
+addCommandAlias("verifyCodeStyle", "scalafmtCheckAll; scalafmtSbtCheck; javafmtCheckAll; headerCheckAll")
+addCommandAlias("applyCodeStyle", "headerCreateAll; scalafmtAll; scalafmtSbt; javafmtAll")
 
 addCommandAlias(
   name = "fixall",
diff --git a/project/JavaFormatter.scala b/project/JavaFormatter.scala
index 9944b231a3..b3a73d68ec 100644
--- a/project/JavaFormatter.scala
+++ b/project/JavaFormatter.scala
@@ -23,8 +23,6 @@ object JavaFormatter extends AutoPlugin {
   private val ignoreConfigFileName: String = ".sbt-java-formatter.conf"
   private val descriptor: String = "sbt-java-formatter"
 
-  private val formatOnCompile = !sys.props.contains("pekko.no.discipline")
-
   import JavaFormatterPlugin.autoImport._
   import sbt.Keys._
   import sbt._
@@ -38,6 +36,5 @@ object JavaFormatter extends AutoPlugin {
           new ProjectFileIgnoreSupport((ThisBuild / baseDirectory).value / ignoreConfigFileName, descriptor)
         val simpleFileFilter = new SimpleFileFilter(file => ignoreSupport.isIgnoredByFileOrPackages(file))
         simpleFileFilter || (javafmt / excludeFilter).value
-      },
-      javafmtOnCompile := formatOnCompile)
+      })
 }