diff --git a/.github/workflows/all.yml b/.github/workflows/all.yml
index e66ec53..583a130 100644
--- a/.github/workflows/all.yml
+++ b/.github/workflows/all.yml
@@ -22,7 +22,8 @@ jobs:
           - rocky8-ansible
           - debian11-ansible
           - debian10-ansible
-          - fedora-ansible
+          - fedora37-ansible
+          - fedora38-ansible
           - opensuse_tumbleweed-ansible
           - openwrt-ansible
           - oracle7-ansible
@@ -55,13 +56,13 @@ jobs:
         uses: docker/build-push-action@v2
         with:
           context: ${{ matrix.dockerimage }}-latest
-          tags: ${{ secrets.DOCKERHUB_USERNAME }}/docker-${{ matrix.dockerimage }}:test
+          tags: docker-${{ matrix.dockerimage }}:test
           platforms: ${{ matrix.platforms }}
           load: true
       -
         name: Test
         run: |
-          docker run --rm ${{ secrets.DOCKERHUB_USERNAME }}/docker-${{ matrix.dockerimage }}:test
+          docker run --rm docker-${{ matrix.dockerimage }}:test
       -
         name: Login to DockerHub
         uses: docker/login-action@v1
diff --git a/.github/workflows/alpine-ansible-latest.yml b/.github/workflows/alpine-ansible-latest.yml
index edad6ad..5745386 100644
--- a/.github/workflows/alpine-ansible-latest.yml
+++ b/.github/workflows/alpine-ansible-latest.yml
@@ -34,13 +34,13 @@ jobs:
         uses: docker/build-push-action@v2
         with:
           context: ${{ matrix.dockerimage }}-latest
-          tags: ${{ secrets.DOCKERHUB_USERNAME }}/docker-${{ matrix.dockerimage }}:test
+          tags: docker-${{ matrix.dockerimage }}:test
           platforms: ${{ matrix.platforms }}
           load: true
       -
         name: Test
         run: |
-          docker run --rm ${{ secrets.DOCKERHUB_USERNAME }}/docker-${{ matrix.dockerimage }}:test
+          docker run --rm docker-${{ matrix.dockerimage }}:test
       -
         name: Login to DockerHub
         uses: docker/login-action@v1
diff --git a/.github/workflows/amazon2-ansible-latest.yml b/.github/workflows/amazon2-ansible-latest.yml
index 3ad1266..e46f1b9 100644
--- a/.github/workflows/amazon2-ansible-latest.yml
+++ b/.github/workflows/amazon2-ansible-latest.yml
@@ -34,13 +34,13 @@ jobs:
         uses: docker/build-push-action@v2
         with:
           context: ${{ matrix.dockerimage }}-latest
-          tags: ${{ secrets.DOCKERHUB_USERNAME }}/docker-${{ matrix.dockerimage }}:test
+          tags: docker-${{ matrix.dockerimage }}:test
           platforms: ${{ matrix.platforms }}
           load: true
       -
         name: Test
         run: |
-          docker run --rm ${{ secrets.DOCKERHUB_USERNAME }}/docker-${{ matrix.dockerimage }}:test
+          docker run --rm docker-${{ matrix.dockerimage }}:test
       -
         name: Login to DockerHub
         uses: docker/login-action@v1
diff --git a/.github/workflows/amazon2023-ansible-latest.yml b/.github/workflows/amazon2023-ansible-latest.yml
index b921d13..d83bc63 100644
--- a/.github/workflows/amazon2023-ansible-latest.yml
+++ b/.github/workflows/amazon2023-ansible-latest.yml
@@ -34,13 +34,13 @@ jobs:
         uses: docker/build-push-action@v2
         with:
           context: ${{ matrix.dockerimage }}-latest
-          tags: ${{ secrets.DOCKERHUB_USERNAME }}/docker-${{ matrix.dockerimage }}:test
+          tags: docker-${{ matrix.dockerimage }}:test
           platforms: ${{ matrix.platforms }}
           load: true
       -
         name: Test
         run: |
-          docker run --rm ${{ secrets.DOCKERHUB_USERNAME }}/docker-${{ matrix.dockerimage }}:test
+          docker run --rm docker-${{ matrix.dockerimage }}:test
       -
         name: Login to DockerHub
         uses: docker/login-action@v1
diff --git a/.github/workflows/arch-ansible-latest.yml b/.github/workflows/arch-ansible-latest.yml
index 5eae58f..1f9be84 100644
--- a/.github/workflows/arch-ansible-latest.yml
+++ b/.github/workflows/arch-ansible-latest.yml
@@ -34,13 +34,13 @@ jobs:
         uses: docker/build-push-action@v2
         with:
           context: ${{ matrix.dockerimage }}-latest
-          tags: ${{ secrets.DOCKERHUB_USERNAME }}/docker-${{ matrix.dockerimage }}:test
+          tags: docker-${{ matrix.dockerimage }}:test
           platforms: ${{ matrix.platforms }}
           load: true
       -
         name: Test
         run: |
-          docker run --rm ${{ secrets.DOCKERHUB_USERNAME }}/docker-${{ matrix.dockerimage }}:test
+          docker run --rm docker-${{ matrix.dockerimage }}:test
       -
         name: Login to DockerHub
         uses: docker/login-action@v1
diff --git a/.github/workflows/centos7-ansible-latest.yml b/.github/workflows/centos7-ansible-latest.yml
index 1c61412..953eed3 100644
--- a/.github/workflows/centos7-ansible-latest.yml
+++ b/.github/workflows/centos7-ansible-latest.yml
@@ -34,13 +34,13 @@ jobs:
         uses: docker/build-push-action@v2
         with:
           context: ${{ matrix.dockerimage }}-latest
-          tags: ${{ secrets.DOCKERHUB_USERNAME }}/docker-${{ matrix.dockerimage }}:test
+          tags: docker-${{ matrix.dockerimage }}:test
           platforms: ${{ matrix.platforms }}
           load: true
       -
         name: Test
         run: |
-          docker run --rm ${{ secrets.DOCKERHUB_USERNAME }}/docker-${{ matrix.dockerimage }}:test
+          docker run --rm docker-${{ matrix.dockerimage }}:test
       -
         name: Login to DockerHub
         uses: docker/login-action@v1
diff --git a/.github/workflows/centos8-ansible-latest.yml b/.github/workflows/centos8-ansible-latest.yml
index 7e05888..ec5a998 100644
--- a/.github/workflows/centos8-ansible-latest.yml
+++ b/.github/workflows/centos8-ansible-latest.yml
@@ -34,13 +34,13 @@ jobs:
         uses: docker/build-push-action@v2
         with:
           context: ${{ matrix.dockerimage }}-latest
-          tags: ${{ secrets.DOCKERHUB_USERNAME }}/docker-${{ matrix.dockerimage }}:test
+          tags: docker-${{ matrix.dockerimage }}:test
           platforms: ${{ matrix.platforms }}
           load: true
       -
         name: Test
         run: |
-          docker run --rm ${{ secrets.DOCKERHUB_USERNAME }}/docker-${{ matrix.dockerimage }}:test
+          docker run --rm docker-${{ matrix.dockerimage }}:test
       -
         name: Login to DockerHub
         uses: docker/login-action@v1
diff --git a/.github/workflows/centosstream8-ansible-latest.yml b/.github/workflows/centosstream8-ansible-latest.yml
index 3841056..5d1b98b 100644
--- a/.github/workflows/centosstream8-ansible-latest.yml
+++ b/.github/workflows/centosstream8-ansible-latest.yml
@@ -34,13 +34,13 @@ jobs:
         uses: docker/build-push-action@v2
         with:
           context: ${{ matrix.dockerimage }}-latest
-          tags: ${{ secrets.DOCKERHUB_USERNAME }}/docker-${{ matrix.dockerimage }}:test
+          tags: docker-${{ matrix.dockerimage }}:test
           platforms: ${{ matrix.platforms }}
           load: true
       -
         name: Test
         run: |
-          docker run --rm ${{ secrets.DOCKERHUB_USERNAME }}/docker-${{ matrix.dockerimage }}:test
+          docker run --rm docker-${{ matrix.dockerimage }}:test
       -
         name: Login to DockerHub
         uses: docker/login-action@v1
diff --git a/.github/workflows/centosstream9-ansible-latest.yml b/.github/workflows/centosstream9-ansible-latest.yml
index bb465fc..8535afe 100644
--- a/.github/workflows/centosstream9-ansible-latest.yml
+++ b/.github/workflows/centosstream9-ansible-latest.yml
@@ -34,13 +34,13 @@ jobs:
         uses: docker/build-push-action@v2
         with:
           context: ${{ matrix.dockerimage }}-latest
-          tags: ${{ secrets.DOCKERHUB_USERNAME }}/docker-${{ matrix.dockerimage }}:test
+          tags: docker-${{ matrix.dockerimage }}:test
           platforms: ${{ matrix.platforms }}
           load: true
       -
         name: Test
         run: |
-          docker run --rm ${{ secrets.DOCKERHUB_USERNAME }}/docker-${{ matrix.dockerimage }}:test
+          docker run --rm docker-${{ matrix.dockerimage }}:test
       -
         name: Login to DockerHub
         uses: docker/login-action@v1
diff --git a/.github/workflows/debian10-ansible-latest.yml b/.github/workflows/debian10-ansible-latest.yml
index e365caa..5fab248 100644
--- a/.github/workflows/debian10-ansible-latest.yml
+++ b/.github/workflows/debian10-ansible-latest.yml
@@ -34,13 +34,13 @@ jobs:
         uses: docker/build-push-action@v2
         with:
           context: ${{ matrix.dockerimage }}-latest
-          tags: ${{ secrets.DOCKERHUB_USERNAME }}/docker-${{ matrix.dockerimage }}:test
+          tags: docker-${{ matrix.dockerimage }}:test
           platforms: ${{ matrix.platforms }}
           load: true
       -
         name: Test
         run: |
-          docker run --rm ${{ secrets.DOCKERHUB_USERNAME }}/docker-${{ matrix.dockerimage }}:test
+          docker run --rm docker-${{ matrix.dockerimage }}:test
       -
         name: Login to DockerHub
         uses: docker/login-action@v1
diff --git a/.github/workflows/debian11-ansible-latest.yml b/.github/workflows/debian11-ansible-latest.yml
index d489a82..1fc6981 100644
--- a/.github/workflows/debian11-ansible-latest.yml
+++ b/.github/workflows/debian11-ansible-latest.yml
@@ -34,13 +34,13 @@ jobs:
         uses: docker/build-push-action@v2
         with:
           context: ${{ matrix.dockerimage }}-latest
-          tags: ${{ secrets.DOCKERHUB_USERNAME }}/docker-${{ matrix.dockerimage }}:test
+          tags: docker-${{ matrix.dockerimage }}:test
           platforms: ${{ matrix.platforms }}
           load: true
       -
         name: Test
         run: |
-          docker run --rm ${{ secrets.DOCKERHUB_USERNAME }}/docker-${{ matrix.dockerimage }}:test
+          docker run --rm docker-${{ matrix.dockerimage }}:test
       -
         name: Login to DockerHub
         uses: docker/login-action@v1
diff --git a/.github/workflows/fedora-ansible-latest.yml b/.github/workflows/fedora37-ansible-latest.yml
similarity index 81%
rename from .github/workflows/fedora-ansible-latest.yml
rename to .github/workflows/fedora37-ansible-latest.yml
index 5c0d99b..1f04ebb 100644
--- a/.github/workflows/fedora-ansible-latest.yml
+++ b/.github/workflows/fedora37-ansible-latest.yml
@@ -1,13 +1,13 @@
-name: fedora-ansible-latest
+name: fedora37-ansible-latest
 on:
   # yamllint disable-line rule:truthy
   workflow_dispatch:
   push:
     paths:
-      - 'fedora-ansible-latest/**'
+      - 'fedora37-ansible-latest/**'
   pull_request:
     paths:
-      - 'fedora-ansible-latest/**'
+      - 'fedora37-ansible-latest/**'
 jobs:
   docker:
     runs-on: ubuntu-latest
@@ -15,7 +15,7 @@ jobs:
       fail-fast: false
       matrix:
         dockerimage:
-          - fedora-ansible
+          - fedora37-ansible
         platforms:
           - linux/amd64
           #- linux/arm64
@@ -34,13 +34,13 @@ jobs:
         uses: docker/build-push-action@v2
         with:
           context: ${{ matrix.dockerimage }}-latest
-          tags: ${{ secrets.DOCKERHUB_USERNAME }}/docker-${{ matrix.dockerimage }}:test
+          tags: docker-${{ matrix.dockerimage }}:test
           platforms: ${{ matrix.platforms }}
           load: true
       -
         name: Test
         run: |
-          docker run --rm ${{ secrets.DOCKERHUB_USERNAME }}/docker-${{ matrix.dockerimage }}:test
+          docker run --rm docker-${{ matrix.dockerimage }}:test
       -
         name: Login to DockerHub
         uses: docker/login-action@v1
diff --git a/.github/workflows/fedora38-ansible-latest.yml b/.github/workflows/fedora38-ansible-latest.yml
new file mode 100644
index 0000000..9798432
--- /dev/null
+++ b/.github/workflows/fedora38-ansible-latest.yml
@@ -0,0 +1,59 @@
+name: fedora38-ansible-latest
+on:
+  # yamllint disable-line rule:truthy
+  workflow_dispatch:
+  push:
+    paths:
+      - 'fedora38-ansible-latest/**'
+  pull_request:
+    paths:
+      - 'fedora38-ansible-latest/**'
+jobs:
+  docker:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        dockerimage:
+          - fedora38-ansible
+        platforms:
+          - linux/amd64
+          #- linux/arm64
+    steps:
+      -
+        name: Checkout
+        uses: actions/checkout@v2
+      -
+        name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+      -
+        name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+      -
+        name: Build and export to Docker
+        uses: docker/build-push-action@v2
+        with:
+          context: ${{ matrix.dockerimage }}-latest
+          tags: docker-${{ matrix.dockerimage }}:test
+          platforms: ${{ matrix.platforms }}
+          load: true
+      -
+        name: Test
+        run: |
+          docker run --rm docker-${{ matrix.dockerimage }}:test
+      -
+        name: Login to DockerHub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+        if: github.ref == 'refs/heads/master'
+      -
+        name: Build and push
+        uses: docker/build-push-action@v2
+        with:
+          context: ${{ matrix.dockerimage }}-latest
+          push: true
+          tags: ${{ secrets.DOCKERHUB_USERNAME }}/docker-${{ matrix.dockerimage }}:latest
+          platforms: ${{ matrix.platforms }}
+        if: github.ref == 'refs/heads/master'
diff --git a/.github/workflows/opensuse_tumbleweed-ansible-latest.yml b/.github/workflows/opensuse_tumbleweed-ansible-latest.yml
index a15849c..ae5b591 100644
--- a/.github/workflows/opensuse_tumbleweed-ansible-latest.yml
+++ b/.github/workflows/opensuse_tumbleweed-ansible-latest.yml
@@ -34,13 +34,13 @@ jobs:
         uses: docker/build-push-action@v2
         with:
           context: ${{ matrix.dockerimage }}-latest
-          tags: ${{ secrets.DOCKERHUB_USERNAME }}/docker-${{ matrix.dockerimage }}:test
+          tags: docker-${{ matrix.dockerimage }}:test
           platforms: ${{ matrix.platforms }}
           load: true
       -
         name: Test
         run: |
-          docker run --rm ${{ secrets.DOCKERHUB_USERNAME }}/docker-${{ matrix.dockerimage }}:test
+          docker run --rm docker-${{ matrix.dockerimage }}:test
       -
         name: Login to DockerHub
         uses: docker/login-action@v1
diff --git a/.github/workflows/openwrt-ansible-latest.yml b/.github/workflows/openwrt-ansible-latest.yml
index ca86d99..6290a95 100644
--- a/.github/workflows/openwrt-ansible-latest.yml
+++ b/.github/workflows/openwrt-ansible-latest.yml
@@ -34,13 +34,13 @@ jobs:
         uses: docker/build-push-action@v2
         with:
           context: ${{ matrix.dockerimage }}-latest
-          tags: ${{ secrets.DOCKERHUB_USERNAME }}/docker-${{ matrix.dockerimage }}:test
+          tags: docker-${{ matrix.dockerimage }}:test
           platforms: ${{ matrix.platforms }}
           load: true
       -
         name: Test
         run: |
-          docker run --rm ${{ secrets.DOCKERHUB_USERNAME }}/docker-${{ matrix.dockerimage }}:test
+          docker run --rm docker-${{ matrix.dockerimage }}:test
       -
         name: Login to DockerHub
         uses: docker/login-action@v1
diff --git a/.github/workflows/oracle7-ansible-latest.yml b/.github/workflows/oracle7-ansible-latest.yml
index 7ec0870..fade0a6 100644
--- a/.github/workflows/oracle7-ansible-latest.yml
+++ b/.github/workflows/oracle7-ansible-latest.yml
@@ -34,13 +34,13 @@ jobs:
         uses: docker/build-push-action@v2
         with:
           context: ${{ matrix.dockerimage }}-latest
-          tags: ${{ secrets.DOCKERHUB_USERNAME }}/docker-${{ matrix.dockerimage }}:test
+          tags: docker-${{ matrix.dockerimage }}:test
           platforms: ${{ matrix.platforms }}
           load: true
       -
         name: Test
         run: |
-          docker run --rm ${{ secrets.DOCKERHUB_USERNAME }}/docker-${{ matrix.dockerimage }}:test
+          docker run --rm docker-${{ matrix.dockerimage }}:test
       -
         name: Login to DockerHub
         uses: docker/login-action@v1
diff --git a/.github/workflows/rocky8-ansible-latest.yml b/.github/workflows/rocky8-ansible-latest.yml
index a0db640..c8f9026 100644
--- a/.github/workflows/rocky8-ansible-latest.yml
+++ b/.github/workflows/rocky8-ansible-latest.yml
@@ -34,13 +34,13 @@ jobs:
         uses: docker/build-push-action@v2
         with:
           context: ${{ matrix.dockerimage }}-latest
-          tags: ${{ secrets.DOCKERHUB_USERNAME }}/docker-${{ matrix.dockerimage }}:test
+          tags: docker-${{ matrix.dockerimage }}:test
           platforms: ${{ matrix.platforms }}
           load: true
       -
         name: Test
         run: |
-          docker run --rm ${{ secrets.DOCKERHUB_USERNAME }}/docker-${{ matrix.dockerimage }}:test
+          docker run --rm docker-${{ matrix.dockerimage }}:test
       -
         name: Login to DockerHub
         uses: docker/login-action@v1
diff --git a/.github/workflows/rocky9-ansible-latest.yml b/.github/workflows/rocky9-ansible-latest.yml
index 77d54e5..c85dcde 100644
--- a/.github/workflows/rocky9-ansible-latest.yml
+++ b/.github/workflows/rocky9-ansible-latest.yml
@@ -34,13 +34,13 @@ jobs:
         uses: docker/build-push-action@v2
         with:
           context: ${{ matrix.dockerimage }}-latest
-          tags: ${{ secrets.DOCKERHUB_USERNAME }}/docker-${{ matrix.dockerimage }}:test
+          tags: docker-${{ matrix.dockerimage }}:test
           platforms: ${{ matrix.platforms }}
           load: true
       -
         name: Test
         run: |
-          docker run --rm ${{ secrets.DOCKERHUB_USERNAME }}/docker-${{ matrix.dockerimage }}:test
+          docker run --rm docker-${{ matrix.dockerimage }}:test
       -
         name: Login to DockerHub
         uses: docker/login-action@v1
diff --git a/.github/workflows/ubuntu1804-ansible-latest.yml b/.github/workflows/ubuntu1804-ansible-latest.yml
index c32f1d1..0449280 100644
--- a/.github/workflows/ubuntu1804-ansible-latest.yml
+++ b/.github/workflows/ubuntu1804-ansible-latest.yml
@@ -34,13 +34,13 @@ jobs:
         uses: docker/build-push-action@v2
         with:
           context: ${{ matrix.dockerimage }}-latest
-          tags: ${{ secrets.DOCKERHUB_USERNAME }}/docker-${{ matrix.dockerimage }}:test
+          tags: docker-${{ matrix.dockerimage }}:test
           platforms: ${{ matrix.platforms }}
           load: true
       -
         name: Test
         run: |
-          docker run --rm ${{ secrets.DOCKERHUB_USERNAME }}/docker-${{ matrix.dockerimage }}:test
+          docker run --rm docker-${{ matrix.dockerimage }}:test
       -
         name: Login to DockerHub
         uses: docker/login-action@v1
diff --git a/.github/workflows/ubuntu2004-ansible-latest.yml b/.github/workflows/ubuntu2004-ansible-latest.yml
index a1d53c9..36ed111 100644
--- a/.github/workflows/ubuntu2004-ansible-latest.yml
+++ b/.github/workflows/ubuntu2004-ansible-latest.yml
@@ -34,13 +34,13 @@ jobs:
         uses: docker/build-push-action@v2
         with:
           context: ${{ matrix.dockerimage }}-latest
-          tags: ${{ secrets.DOCKERHUB_USERNAME }}/docker-${{ matrix.dockerimage }}:test
+          tags: docker-${{ matrix.dockerimage }}:test
           platforms: ${{ matrix.platforms }}
           load: true
       -
         name: Test
         run: |
-          docker run --rm ${{ secrets.DOCKERHUB_USERNAME }}/docker-${{ matrix.dockerimage }}:test
+          docker run --rm docker-${{ matrix.dockerimage }}:test
       -
         name: Login to DockerHub
         uses: docker/login-action@v1
diff --git a/.github/workflows/ubuntu2204-ansible-latest.yml b/.github/workflows/ubuntu2204-ansible-latest.yml
index a6d7c1a..5f36899 100644
--- a/.github/workflows/ubuntu2204-ansible-latest.yml
+++ b/.github/workflows/ubuntu2204-ansible-latest.yml
@@ -34,13 +34,13 @@ jobs:
         uses: docker/build-push-action@v2
         with:
           context: ${{ matrix.dockerimage }}-latest
-          tags: ${{ secrets.DOCKERHUB_USERNAME }}/docker-${{ matrix.dockerimage }}:test
+          tags: docker-${{ matrix.dockerimage }}:test
           load: true
           platforms: ${{ matrix.platforms }}
       -
         name: Test
         run: |
-          docker run --rm ${{ secrets.DOCKERHUB_USERNAME }}/docker-${{ matrix.dockerimage }}:test
+          docker run --rm docker-${{ matrix.dockerimage }}:test
       -
         name: Login to DockerHub
         uses: docker/login-action@v1
diff --git a/README.md b/README.md
index 140a5be..7320264 100644
--- a/README.md
+++ b/README.md
@@ -22,7 +22,8 @@ They are meant for testing purposes and are mainly used for [dev-sec](https://gi
 | [Amazon Linux][amazon]            | [docker-amazon-ansible-latest][]              | [rndmh3ro/docker-amazon-ansible-latest][]              |
 | [Amazon Linux 2][amazon]          | [docker-amazon2-ansible-latest][]             | [rndmh3ro/docker-amazon2-ansible-latest][]             |
 | [Amazon Linux 2023][amazon]       | [docker-amazon2023-ansible-latest][]          | [rndmh3ro/docker-amazon2023-ansible-latest][]          |
-| [Fedora][fedora]                  | [docker-fedora-ansible-latest][]              | [rndmh3ro/docker-fedora-ansible-latest][]              |
+| [Fedora 37][fedora]               | [docker-fedora37-ansible-latest][]            | [rndmh3ro/docker-fedora37-ansible-latest][]            |
+| [Fedora 38][fedora]               | [docker-fedora38-ansible-latest][]            | [rndmh3ro/docker-fedora38-ansible-latest][]            |
 | [OpenSuse Tumbleweed][tumbleweed] | [docker-opensuse_tumbleweed-ansible-latest][] | [rndmh3ro/docker-opensuse_tumbleweed-ansible-latest][] |
 | [Arch Linux][arch]                | [docker-arch-ansible-latest][]                | [rndmh3ro/docker-arch-ansible-latest][]                |
 | [OpenWRT][openwrt]                | [docker-openwrt-ansible-latest][]             | [rndmh3ro/docker-openwrt-ansible-latest][]             |
@@ -58,7 +59,8 @@ Sebastian Gumprich <github@gumpri.ch>
 [docker-alpine-ansible-latest]: https://github.com/rndmh3ro/docker-ansible/blob/master/alpine-ansible-latest/Dockerfile
 [docker-amazon2-ansible-latest]: https://github.com/rndmh3ro/docker-ansible/blob/master/amazon2-ansible-latest/Dockerfile
 [docker-amazon2023-ansible-latest]: https://github.com/rndmh3ro/docker-ansible/blob/master/amazon2023-ansible-latest/Dockerfile
-[docker-fedora-ansible-latest]: https://github.com/rndmh3ro/docker-ansible/blob/master/fedora-ansible-latest/Dockerfile
+[docker-fedora37-ansible-latest]: https://github.com/rndmh3ro/docker-ansible/blob/master/fedora37-ansible-latest/Dockerfile
+[docker-fedora38-ansible-latest]: https://github.com/rndmh3ro/docker-ansible/blob/master/fedora38-ansible-latest/Dockerfile
 [docker-opensuse_tumbleweed-ansible-latest]: https://github.com/rndmh3ro/docker-ansible/blob/master/opensuse_tumbleweed-ansible-latest/Dockerfile
 [docker-arch-ansible-latest]: https://github.com/rndmh3ro/docker-ansible/blob/master/arch-ansible-latest/Dockerfile
 [docker-openwrt-ansible-latest]: https://github.com/rndmh3ro/docker-ansible/blob/master/openwrt-ansible-latest/Dockerfile
@@ -79,7 +81,8 @@ Sebastian Gumprich <github@gumpri.ch>
 [rndmh3ro/docker-alpine-ansible-latest]: https://hub.docker.com/r/rndmh3ro/docker-alpine-ansible
 [rndmh3ro/docker-amazon2-ansible-latest]: https://hub.docker.com/r/rndmh3ro/docker-amazon2-ansible
 [rndmh3ro/docker-amazon2023-ansible-latest]: https://hub.docker.com/r/rndmh3ro/docker-amazon2023-ansible
-[rndmh3ro/docker-fedora-ansible-latest]: https://hub.docker.com/r/rndmh3ro/docker-fedora-ansible
+[rndmh3ro/docker-fedora37-ansible-latest]: https://hub.docker.com/r/rndmh3ro/docker-fedora37-ansible
+[rndmh3ro/docker-fedora38-ansible-latest]: https://hub.docker.com/r/rndmh3ro/docker-fedora38-ansible
 [rndmh3ro/docker-opensuse_tumbleweed-ansible-latest]: https://hub.docker.com/repository/docker/rndmh3ro/docker-opensuse_tumbleweed-ansible
 [rndmh3ro/docker-arch-ansible-latest]: https://hub.docker.com/r/rndmh3ro/docker-arch-ansible
 [rndmh3ro/docker-openwrt-ansible-latest]: https://hub.docker.com/r/rndmh3ro/docker-openwrt-ansible
diff --git a/fedora-ansible-latest/Dockerfile b/fedora37-ansible-latest/Dockerfile
similarity index 94%
rename from fedora-ansible-latest/Dockerfile
rename to fedora37-ansible-latest/Dockerfile
index 8e33dfb..21b6913 100644
--- a/fedora-ansible-latest/Dockerfile
+++ b/fedora37-ansible-latest/Dockerfile
@@ -1,5 +1,5 @@
-FROM fedora:latest
-LABEL maintainer="Sebastian Gumprich"
+FROM fedora:37
+LABEL maintainer="Sebastian Gumprich; Nejc Habjan; Diego Louzan; Max Wittig"
 
 # Enable systemd.
 RUN dnf -y install systemd && dnf clean all && \
diff --git a/fedora38-ansible-latest/Dockerfile b/fedora38-ansible-latest/Dockerfile
new file mode 100644
index 0000000..31bbfec
--- /dev/null
+++ b/fedora38-ansible-latest/Dockerfile
@@ -0,0 +1,34 @@
+FROM fedora:38
+LABEL maintainer="Sebastian Gumprich, Nejc Habjan, Diego Louzan, Max Wittig"
+
+# Enable systemd.
+RUN dnf -y install systemd && dnf clean all && \
+  (cd /lib/systemd/system/sysinit.target.wants/; for i in *; do [ $i == systemd-tmpfiles-setup.service ] || rm -f $i; done); \
+  rm -f /lib/systemd/system/multi-user.target.wants/*;\
+  rm -f /etc/systemd/system/*.wants/*;\
+  rm -f /lib/systemd/system/local-fs.target.wants/*; \
+  rm -f /lib/systemd/system/sockets.target.wants/*udev*; \
+  rm -f /lib/systemd/system/sockets.target.wants/*initctl*; \
+  rm -f /lib/systemd/system/basic.target.wants/*;\
+  rm -f /lib/systemd/system/anaconda.target.wants/*;
+
+RUN dnf -y update \
+    && dnf -y install ansible python python3-libselinux \
+    && dnf clean all
+
+RUN echo -e '[local]\nlocalhost ansible_connection=local' > /etc/ansible/hosts
+
+# https://molecule.readthedocs.io/en/latest/examples.html#docker-with-non-privileged-user
+# Create `ansible` user with sudo permissions and membership in `DEPLOY_GROUP`
+# This template gets rendered using `loop: "{{ molecule_yml.platforms }}"`, so
+# each `item` is an element of platforms list from the molecule.yml file for this scenario.
+ENV ANSIBLE_USER=ansible DEPLOY_GROUP=deployer SUDO_GROUP=wheel
+RUN set -xe \
+  && groupadd -r ${ANSIBLE_USER} \
+  && groupadd -r ${DEPLOY_GROUP} \
+  && useradd -m -g ${ANSIBLE_USER} ${ANSIBLE_USER} \
+  && usermod -aG ${SUDO_GROUP} ${ANSIBLE_USER} \
+  && usermod -aG ${DEPLOY_GROUP} ${ANSIBLE_USER} \
+  && sed -i "/^%${SUDO_GROUP}/s/ALL\$/NOPASSWD:ALL/g" /etc/sudoers
+
+CMD [ "ansible-playbook", "--version" ]