diff --git a/.circleci/config.yml b/.circleci/config.yml
deleted file mode 100644
index 7e86245..0000000
--- a/.circleci/config.yml
+++ /dev/null
@@ -1,58 +0,0 @@
-version: 2.1
-
-jobs:
-  ant-build-and-test:
-    working_directory: ~/AlgoLib_Java
-    docker:
-      - image: cimg/base:stable
-        auth:
-          username: mydockerhub-user
-          password: $DOCKERHUB_PASSWORD
-    steps:
-      - checkout
-      - run:
-          name: APT Install Java
-          command: sudo apt-get update && sudo apt-get install openjdk-17-jdk
-      - run:
-          name: APT Install Apache ANT
-          command: sudo apt-get update && sudo apt-get install ant
-      - run:
-          name: Install JUnit5 for ANT
-          command: ./ci/install_ant_junit5.sh
-      - run:
-          name: Download Dependencies
-          command: ant resolve
-      - run:
-          name: Build
-          command: ant jar
-      - run:
-          name: Test
-          command: ant test
-      - store_test_results:
-          path: ./antBuild/junit/result
-  gradle-build-and-test:
-    working_directory: ~/AlgoLib_Java
-    docker:
-      - image: cimg/base:stable
-        auth:
-          username: mydockerhub-user
-          password: $DOCKERHUB_PASSWORD
-    steps:
-      - checkout
-      - run:
-          name: APT Install Java
-          command: sudo apt-get update && sudo apt-get install openjdk-17-jdk
-      - run:
-          name: Build
-          command: ./gradlew jar
-      - run:
-          name: Test
-          command: ./gradlew test
-      - store_test_results:
-          path: ./build/test-results/test
-
-workflows:
-  main:
-    jobs:
-      - ant-build-and-test
-      - gradle-build-and-test
diff --git a/.github/workflows/ant-build-and-test.yml b/.github/workflows/ant-build-and-test.yml
deleted file mode 100644
index 205e997..0000000
--- a/.github/workflows/ant-build-and-test.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-name: GitHub Actions
-
-on: [ push, pull_request ]
-
-jobs:
-  ant-build-and-test:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - name: APT Install Java
-        run: |
-          sudo apt-get update && sudo apt-get install openjdk-17-jdk
-          sudo update-java-alternatives --set java-1.17.0-openjdk-amd64
-      - name: APT Install Apache ANT
-        run: sudo apt-get update && sudo apt-get install ant
-      - name: Install JUnit5 for ANT
-        run: ./ci/install_ant_junit5.sh
-      - name: Download Dependencies
-        run: |
-          export JAVA_HOME=/usr/lib/jvm/java-17-openjdk-amd64
-          ant resolve
-      - name: Build
-        run: |
-          export JAVA_HOME=/usr/lib/jvm/java-17-openjdk-amd64
-          ant build
-      - name: Test
-        run: |
-          export JAVA_HOME=/usr/lib/jvm/java-17-openjdk-amd64
-          ant test
diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
new file mode 100644
index 0000000..cb7db67
--- /dev/null
+++ b/.github/workflows/build-and-test.yml
@@ -0,0 +1,48 @@
+name: GitHub Actions
+
+on:
+  - push
+  - pull_request
+
+jobs:
+  gradle-build-and-test:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: actions/setup-java@v4
+        with:
+          java-version: 17
+          distribution: temurin
+
+      - uses: gradle/actions/setup-gradle@v4
+
+      - name: Build
+        run: $GITHUB_WORKSPACE/gradlew jar
+
+      - name: Test
+        run: $GITHUB_WORKSPACE/gradlew test
+
+  ant-build-and-test:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: actions/setup-java@v4
+        with:
+          java-version: 17
+          distribution: temurin
+
+      - name: Install JUnit5 for ANT
+        run: $GITHUB_WORKSPACE/ci/install_ant_junit5.sh
+
+      - name: Download Dependencies
+        run: ant resolve
+
+      - name: Build
+        run: ant build
+
+      - name: Test
+        run: ant test
diff --git a/.github/workflows/gradle-build-and-test.yml b/.github/workflows/gradle-build-and-test.yml
deleted file mode 100644
index 1559adc..0000000
--- a/.github/workflows/gradle-build-and-test.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-name: GitHub Actions
-
-on: [ push, pull_request ]
-
-jobs:
-  gradle-build-and-test:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - name: APT Install Java
-        run: |
-          sudo apt-get update && sudo apt-get install openjdk-17-jdk
-          sudo update-java-alternatives --set java-1.17.0-openjdk-amd64
-      - name: Build
-        run: |
-          export JAVA_HOME=/usr/lib/jvm/java-17-openjdk-amd64
-          ./gradlew jar
-      - name: Test
-        run: |
-          export JAVA_HOME=/usr/lib/jvm/java-17-openjdk-amd64
-          ./gradlew test
diff --git a/README.md b/README.md
index cb16e67..c93eabb 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,8 @@
 # AlgoLib_Java
 
-![GitHub Actions](https://github.com/ref-humbold/AlgoLib_Java/workflows/GitHub%20Actions/badge.svg?branch=master)
-[![CircleCI](https://circleci.com/gh/ref-humbold/AlgoLib_Java/tree/master.svg?style=shield)](https://circleci.com/gh/ref-humbold/AlgoLib_Java/tree/master)
+[![GitHub Actions](https://github.com/ref-humbold/AlgoLib_Java/actions/workflows/build-and-test.yml/badge.svg)](https://github.com/ref-humbold/AlgoLib_Java/actions/workflows/build-and-test.yml)
+
+![License](https://img.shields.io/github/license/ref-humbold/AlgoLib_Java?style=plastic)
 
 ALGOrithms LIBrary - Java version