diff --git a/.docker/Dockerfile-php82 b/.docker/PHP83-Dockerfile
similarity index 93%
rename from .docker/Dockerfile-php82
rename to .docker/PHP83-Dockerfile
index a616cf7..f0eb8a8 100644
--- a/.docker/Dockerfile-php82
+++ b/.docker/PHP83-Dockerfile
@@ -1,4 +1,4 @@
-FROM php:8.2-fpm
+FROM php:8.3-fpm
 
 RUN apt-get update
 RUN apt-get --yes --no-install-recommends install \
@@ -34,7 +34,7 @@ RUN docker-php-ext-install -j$(nproc) \
 COPY build/php/opcache.ini /usr/local/etc/php/conf.d/
 COPY build/php/custom.ini /usr/local/etc/php/conf.d/
 
-RUN pecl install xdebug-3.2.1 && docker-php-ext-enable xdebug
+RUN pecl install xdebug-3.3.0alpha3 && docker-php-ext-enable xdebug
 
 RUN php --version
 
diff --git a/.github/workflows/code-style.yml b/.github/workflows/code-style.yml
index 728fa56..c3a1b19 100644
--- a/.github/workflows/code-style.yml
+++ b/.github/workflows/code-style.yml
@@ -12,7 +12,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: ['8.2']
+        php: ['8.3']
 
     name: "Check code style | PHP ${{ matrix.php }}"
 
diff --git a/.github/workflows/phpstan.yml b/.github/workflows/phpstan.yml
index a9c324d..cacda84 100644
--- a/.github/workflows/phpstan.yml
+++ b/.github/workflows/phpstan.yml
@@ -14,7 +14,7 @@ jobs:
       fail-fast: false
       matrix:
         operating-system: ['ubuntu-latest']
-        php: ['8.2']
+        php: ['8.3']
 
     steps:
       - name: Checkout
diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
index 85d91ee..01609e7 100644
--- a/.github/workflows/unit-tests.yml
+++ b/.github/workflows/unit-tests.yml
@@ -14,7 +14,7 @@ jobs:
       fail-fast: false
       matrix:
         operating-system: ['ubuntu-latest']
-        php: ['7.4', '8.0', '8.1', '8.2', '8.3']
+        php: ['7.4', '8.0', '8.1', '8.2', '8.3', '8.4']
 
     steps:
       - name: Checkout
@@ -30,11 +30,11 @@ jobs:
           tools: none
 
       - name: "Install Composer dependencies"
-        if: ${{ matrix.php < '8.3' }}
+        if: ${{ matrix.php <= '8.3' }}
         uses: "ramsey/composer-install@v2"
 
-      - name: "Install Composer dependencies (PHP 8.3)"
-        if: ${{ matrix.php >= '8.3' }}
+      - name: "Install Composer dependencies (PHP 8.4)"
+        if: ${{ matrix.php >= '8.4' }}
         uses: "ramsey/composer-install@v2"
         with:
           composer-options: --ignore-platform-reqs
@@ -43,7 +43,7 @@ jobs:
         run: composer run phpunit -- --coverage-clover .phpunit.cache/clover.xml
 
       - name: Upload coverage reports to Codecov
-        if: ${{ success() && matrix.php == '8.2' }}
+        if: ${{ success() && matrix.php == '8.3' }}
         uses: codecov/codecov-action@v3
         env:
           CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 30cab1d..60636cb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,7 +9,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ### Added
 
-- Add support for PHP 8.2
+- Add support for PHP 8.2 and PHP 8.3
 
 ### Deprecated
 
diff --git a/composer.json b/composer.json
index 48f9de4..f01bf94 100644
--- a/composer.json
+++ b/composer.json
@@ -13,7 +13,7 @@
         }
     ],
     "require": {
-        "php": "^7.4 || ~8.0.0 || ~8.1.0 || ~8.2.0"
+        "php": "^7.4 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0"
     },
     "require-dev": {
         "friendsofphp/php-cs-fixer": "^3.35",
diff --git a/docker-compose.yml b/docker-compose.yml
index e51cf35..5457f40 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -10,7 +10,7 @@ services:
             # Specify where the Dockerfile is located (e.g. in the root directory of the project)
             context: .docker
             # Specify the name of the Dockerfile for changing the PHP version
-            dockerfile: Dockerfile-php82
+            dockerfile: PHP83-Dockerfile
         # Modifiy Ports for every project: <outside>:<inside>
         ports:
             - 8200:80