diff --git a/.cirrus.yml b/.cirrus.yml
index a88cf23fa0..32ab5adbd0 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -163,19 +163,19 @@ env:
 # Linux EOL timelines: https://linuxlifecycle.com/
 # Fedora (~13 months): https://fedoraproject.org/wiki/Fedora_Release_Life_Cycle
 
+fedora38_task:
+  container:
+    # Fedora 38 EOL: Around May 2024
+    dockerfile: ci/fedora-38/Dockerfile
+    << : *RESOURCES_TEMPLATE
+  << : *CI_TEMPLATE
+
 fedora37_task:
   container:
     # Fedora 37 EOL: Around Dec 2024
     dockerfile: ci/fedora-37/Dockerfile
     << : *RESOURCES_TEMPLATE
   << : *CI_TEMPLATE
-
-fedora36_task:
-  container:
-    # Fedora 36 EOL: Around May 2023
-    dockerfile: ci/fedora-36/Dockerfile
-    << : *RESOURCES_TEMPLATE
-  << : *CI_TEMPLATE
   << : *SKIP_TASK_ON_PR
 
 centosstream9_task:
@@ -253,8 +253,9 @@ opensuse_tumbleweed_task:
     # Opensuse Tumbleweed has no EOL
     dockerfile: ci/opensuse-tumbleweed/Dockerfile
     << : *RESOURCES_TEMPLATE
+  prepare_script: ./ci/opensuse-tumbleweed/prepare.sh
   << : *CI_TEMPLATE
-  << : *SKIP_TASK_ON_PR
+#  << : *SKIP_TASK_ON_PR
 
 ubuntu2210_task:
   container:
diff --git a/CHANGES b/CHANGES
index c115bead82..e871a74eb2 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,9 @@
+6.0.0-dev.470 | 2023-04-28 16:33:46 -0700
+
+  * CI: Automatically update opensuse-tumbleweed (Tim Wojtulewicz, Corelight)
+
+  * CI: Remove Fedora 36, add Fedora 38 (Tim Wojtulewicz, Corelight)
+
 6.0.0-dev.467 | 2023-04-28 10:01:13 +0200
 
   * GH-2791: pcap/Source: Allow more than 32bit for link and dropped stats (Arne Welzel, Corelight)
diff --git a/VERSION b/VERSION
index 39ca79e52c..d44ee2e2cc 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-6.0.0-dev.467
+6.0.0-dev.470
diff --git a/ci/fedora-38/Dockerfile b/ci/fedora-38/Dockerfile
new file mode 100644
index 0000000000..d70df35b24
--- /dev/null
+++ b/ci/fedora-38/Dockerfile
@@ -0,0 +1,32 @@
+FROM fedora:38
+
+# A version field to invalidate Cirrus's build cache when needed, as suggested in
+# https://github.com/cirruslabs/cirrus-ci-docs/issues/544#issuecomment-566066822
+ENV DOCKERFILE_VERSION 20230428
+
+RUN dnf -y install \
+    bison \
+    ccache \
+    cmake \
+    diffutils \
+    findutils \
+    flex \
+    gcc \
+    gcc-c++ \
+    git \
+    libpcap-devel \
+    make \
+    nodejs-devel \
+    openssl \
+    openssl-devel \
+    procps-ng \
+    python3 \
+    python3-devel \
+    python3-pip\
+    sqlite \
+    swig \
+    which \
+    zlib-devel \
+  && dnf clean all && rm -rf /var/cache/dnf
+
+RUN pip3 install websockets junit2html
diff --git a/ci/fedora-36/Dockerfile b/ci/fedora-38/Dockerfile~
similarity index 100%
rename from ci/fedora-36/Dockerfile
rename to ci/fedora-38/Dockerfile~
diff --git a/ci/opensuse-tumbleweed/Dockerfile b/ci/opensuse-tumbleweed/Dockerfile
index b4d8cf19c1..2726c9c58f 100644
--- a/ci/opensuse-tumbleweed/Dockerfile
+++ b/ci/opensuse-tumbleweed/Dockerfile
@@ -2,7 +2,7 @@ FROM opensuse/tumbleweed
 
 # A version field to invalidate Cirrus's build cache when needed, as suggested in
 # https://github.com/cirruslabs/cirrus-ci-docs/issues/544#issuecomment-566066822
-ENV DOCKERFILE_VERSION 20230330
+ENV DOCKERFILE_VERSION 20230428
 
 RUN zypper refresh \
  && zypper in -y \
diff --git a/ci/opensuse-tumbleweed/prepare.sh b/ci/opensuse-tumbleweed/prepare.sh
new file mode 100755
index 0000000000..ae8877d060
--- /dev/null
+++ b/ci/opensuse-tumbleweed/prepare.sh
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+zypper refresh
+zypper patch -y --with-update --with-optional