diff --git a/docker/rucio-daemons/Dockerfile b/docker/rucio-daemons/Dockerfile
index 96d6e67..0b25982 100644
--- a/docker/rucio-daemons/Dockerfile
+++ b/docker/rucio-daemons/Dockerfile
@@ -26,16 +26,9 @@ RUN rmdir /etc/grid-security/certificates && ln -s /cvmfs/grid.cern.ch/etc/grid-
 
 ADD docker/rucio-daemons/cms-entrypoint.sh /
 
-# Cannot make patch directory unless there are patches
-RUN mkdir -p /patch
-
-# Patch for dst_file_report: Remove when https://github.com/rucio/rucio/pull/7081 is available
-ADD https://patch-diff.githubusercontent.com/raw/dynamic-entropy/rucio/pull/1.patch /patch/1.patch
-
-# Patch for directory scoped token support
-ADD https://patch-diff.githubusercontent.com/raw/dynamic-entropy/rucio/pull/4.patch /patch/token.patch
-
-# Patch for deep flag
-ADD https://patch-diff.githubusercontent.com/raw/rucio/rucio/pull/7170.diff /patch/7170.patch
+# Patches are now included via flux secrets. Please see:
+# https://github.com/dmwm/rucio-flux/blob/main/apps/base/patches/kustomization.yaml (and that directory)
+# https://github.com/dmwm/rucio-flux/blob/main/apps/base/rucio-daemons/cms-rucio-daemons.yaml
+# And prod/int-rucio-daemons.yaml
 
 ENTRYPOINT ["/cms-entrypoint.sh"]
diff --git a/docker/rucio-server/Dockerfile b/docker/rucio-server/Dockerfile
index 490cacf..050ec6b 100644
--- a/docker/rucio-server/Dockerfile
+++ b/docker/rucio-server/Dockerfile
@@ -23,16 +23,9 @@ ADD docker/rucio-server/cms-entrypoint.sh /
 ADD docker/rucio-server/install_mail_templates.sh /tmp/
 RUN /tmp/install_mail_templates.sh
 
-# Cannot make patch directory unless there are patches
-RUN mkdir -p /patch
-
-# Patch for dst_file_report: Remove when https://github.com/rucio/rucio/pull/7081 is available
-ADD https://patch-diff.githubusercontent.com/raw/dynamic-entropy/rucio/pull/1.patch /patch/1.patch
-
-# Patch for directory scoped token support
-ADD https://patch-diff.githubusercontent.com/raw/dynamic-entropy/rucio/pull/4.patch /patch/token.patch
-
-# Patch for deep flag
-ADD https://patch-diff.githubusercontent.com/raw/rucio/rucio/pull/7170.diff /patch/7170.patch
+# Patches are now included via flux secrets. Please see:
+# https://github.com/dmwm/rucio-flux/blob/main/apps/base/patches/kustomization.yaml (and that directory)
+# https://github.com/dmwm/rucio-flux/blob/main/apps/base/rucio-server/cms-rucio-server.yaml
+# And prod/int-rucio-server.yaml
 
 ENTRYPOINT ["/cms-entrypoint.sh"]
diff --git a/src/policy/CMSRucioPolicy/__init__.py b/src/policy/CMSRucioPolicy/__init__.py
index 31cc983..b471f01 100644
--- a/src/policy/CMSRucioPolicy/__init__.py
+++ b/src/policy/CMSRucioPolicy/__init__.py
@@ -4,7 +4,7 @@
 
 from CMSRucioPolicy.algorithms import lfn2pfn, auto_approve, pfn2lfn
 
-SUPPORTED_VERSION = ["32", "33", "34", "35"]
+SUPPORTED_VERSION = [">= 36.0"]
 
 
 def get_algorithms():