diff --git a/.github/workflows/github-ci.yml b/.github/workflows/github-ci.yml
index e0f6fec9..0b0dbcd1 100644
--- a/.github/workflows/github-ci.yml
+++ b/.github/workflows/github-ci.yml
@@ -36,6 +36,9 @@ jobs:
       - uses: actions/setup-node@v1
         with:
           node-version: ${{ matrix.node_version }}
+      - uses: actions/setup-java@v1
+        with:
+          java-version: '11.x'
       - name: Install dependencies
         run: yarn
       - name: Run CI
@@ -56,6 +59,9 @@ jobs:
       - uses: actions/setup-node@v1
         with:
           node-version: ${{ matrix.node_version }}
+      - uses: actions/setup-java@v1
+        with:
+          java-version: '11.x'
       - name: Install dependencies
         run: yarn
       - name: Run e2e tests
diff --git a/packages/java-parser/scripts/clone-samples.js b/packages/java-parser/scripts/clone-samples.js
index 51898735..fd88a51f 100644
--- a/packages/java-parser/scripts/clone-samples.js
+++ b/packages/java-parser/scripts/clone-samples.js
@@ -72,10 +72,6 @@ const sampleRepos = [
     repoUrl: "https://github.com/jhipster/jhipster-sample-app-dto",
     branch: "main"
   },
-  {
-    repoUrl: "https://github.com/jhipster/jhipster-sample-app-couchbase",
-    branch: "main"
-  },
   {
     repoUrl: "https://github.com/jhipster/jhipster-sample-app-cassandra",
     branch: "main"
diff --git a/packages/java-parser/test/samples-spec.js b/packages/java-parser/test/samples-spec.js
index f4756cc2..a4d3bc91 100644
--- a/packages/java-parser/test/samples-spec.js
+++ b/packages/java-parser/test/samples-spec.js
@@ -15,7 +15,6 @@ describe("The Java Parser", () => {
   createSampleSpecs("jhipster-online");
   createSampleSpecs("jhipster-sample-app");
   createSampleSpecs("jhipster-sample-app-cassandra");
-  createSampleSpecs("jhipster-sample-app-couchbase");
   createSampleSpecs("jhipster-sample-app-dto");
   createSampleSpecs("jhipster-sample-app-elasticsearch");
   createSampleSpecs("jhipster-sample-app-gateway");
diff --git a/packages/prettier-plugin-java/scripts/clone-samples.js b/packages/prettier-plugin-java/scripts/clone-samples.js
index d1220ad7..c545cd50 100644
--- a/packages/prettier-plugin-java/scripts/clone-samples.js
+++ b/packages/prettier-plugin-java/scripts/clone-samples.js
@@ -69,10 +69,6 @@ const jhipster2 = [
     repoUrl: "https://github.com/jhipster/jhipster-sample-app-dto",
     branch: "main"
   },
-  {
-    repoUrl: "https://github.com/jhipster/jhipster-sample-app-couchbase",
-    branch: "main"
-  },
   {
     repoUrl: "https://github.com/jhipster/jhipster-sample-app-cassandra",
     branch: "main"
diff --git a/packages/prettier-plugin-java/src/printers/classes.js b/packages/prettier-plugin-java/src/printers/classes.js
index 95fd9ef0..bf6688cc 100644
--- a/packages/prettier-plugin-java/src/printers/classes.js
+++ b/packages/prettier-plugin-java/src/printers/classes.js
@@ -354,6 +354,7 @@ class ClassesPrettierVisitor {
         currentSegment = [];
       } else if (token.name === "annotation") {
         currentSegment.push(this.visit([token]));
+        currentSegment.push(" ");
       } else {
         currentSegment.push(token);
         if (
diff --git a/packages/prettier-plugin-java/test/repository-test/jhipster-2-test.js b/packages/prettier-plugin-java/test/repository-test/jhipster-2-test.js
index d366fdd6..38a83c3b 100644
--- a/packages/prettier-plugin-java/test/repository-test/jhipster-2-test.js
+++ b/packages/prettier-plugin-java/test/repository-test/jhipster-2-test.js
@@ -5,7 +5,6 @@ const { testRepositorySample } = require("../test-utils");
 const jhipsterRepository = [
   "jhipster-sample-app-elasticsearch",
   "jhipster-sample-app-dto",
-  "jhipster-sample-app-couchbase",
   "jhipster-sample-app-cassandra",
   "jhipster-sample-app-mongodb",
   "jhipster-sample-app-react"
diff --git a/packages/prettier-plugin-java/test/unit-test/blank_lines/args-spec.js b/packages/prettier-plugin-java/test/unit-test/blank_lines/blank_lines-spec.js
similarity index 100%
rename from packages/prettier-plugin-java/test/unit-test/blank_lines/args-spec.js
rename to packages/prettier-plugin-java/test/unit-test/blank_lines/blank_lines-spec.js
diff --git a/packages/prettier-plugin-java/test/unit-test/bug-fixes/_input.java b/packages/prettier-plugin-java/test/unit-test/bug-fixes/_input.java
new file mode 100644
index 00000000..ce929b44
--- /dev/null
+++ b/packages/prettier-plugin-java/test/unit-test/bug-fixes/_input.java
@@ -0,0 +1,10 @@
+class T {
+    // Fix for https://github.com/jhipster/prettier-java/issues/453
+    SomeClass.@Valid SomeInnerClass someInnerClass = someClass.getInteractions().get(0);
+
+    // Fix for https://github.com/jhipster/prettier-java/issues/444
+    void process(
+        Map.@NonNull Entry<String, SkeletonConfiguration> entry,
+        @NonNull Map<String, Object> context
+    ) {}
+}
diff --git a/packages/prettier-plugin-java/test/unit-test/bug-fixes/_output.java b/packages/prettier-plugin-java/test/unit-test/bug-fixes/_output.java
new file mode 100644
index 00000000..94283120
--- /dev/null
+++ b/packages/prettier-plugin-java/test/unit-test/bug-fixes/_output.java
@@ -0,0 +1,13 @@
+class T {
+
+  // Fix for https://github.com/jhipster/prettier-java/issues/453
+  SomeClass.@Valid SomeInnerClass someInnerClass = someClass
+    .getInteractions()
+    .get(0);
+
+  // Fix for https://github.com/jhipster/prettier-java/issues/444
+  void process(
+    Map.@NonNull Entry<String, SkeletonConfiguration> entry,
+    @NonNull Map<String, Object> context
+  ) {}
+}
diff --git a/packages/prettier-plugin-java/test/unit-test/bug-fixes/bug-fixes-spec.js b/packages/prettier-plugin-java/test/unit-test/bug-fixes/bug-fixes-spec.js
new file mode 100644
index 00000000..c5a78b07
--- /dev/null
+++ b/packages/prettier-plugin-java/test/unit-test/bug-fixes/bug-fixes-spec.js
@@ -0,0 +1,3 @@
+describe("prettier-java", () => {
+  require("../../test-utils").testSample(__dirname);
+});