diff --git a/metric-collector-for-apache-cassandra-4.1.yaml b/metric-collector-for-apache-cassandra-4.1.yaml
index e2e9d5e2782..7fe07d32baa 100644
--- a/metric-collector-for-apache-cassandra-4.1.yaml
+++ b/metric-collector-for-apache-cassandra-4.1.yaml
@@ -1,7 +1,7 @@
 package:
   name: metric-collector-for-apache-cassandra-4.1
-  version: 0.3.5
-  epoch: 5
+  version: "0.3.6"
+  epoch: 0
   description: Drop-in metrics collection and dashboards for Apache Cassandra
   copyright:
     - license: Apache-2.0
@@ -29,13 +29,9 @@ pipeline:
   - uses: git-checkout
     with:
       repository: https://github.com/datastax/metric-collector-for-apache-cassandra
-      expected-commit: f97a258ea95d055c71f762c3725061f43678ae1f
+      expected-commit: 7b7bbf2d3081e80e5148711696cb1408e212fd48
       tag: v${{package.version}}
 
-  - uses: patch
-    with:
-      patches: collectd-download-url-fix.patch
-
   # DO NOT bump snakeyaml to v2.0, as this version has breaking changes. This
   # needs to remain on v1.x
   - uses: maven/pombump
@@ -63,8 +59,15 @@ test:
     contents:
       packages:
         - bash
-        - openjdk-11-default-jvm
+        - openjdk-11-default-jdk
   pipeline:
+    # Will fail see https://github.com/wolfi-dev/os/issues/34356
+    # - uses: test/pkgconf
+    # Will fail see https://github.com/wolfi-dev/os/issues/48193
+    # We need to clean up this package, re-think the vendoring situation
+    # - uses: test/ldd-check
+    #   with:
+    #     packages: ${{package.name}}
     - name: Check JAR integrity
       runs: |
         jar tvf /opt/metrics-collector/lib/datastax-mcac-agent.jar > /dev/null 2>&1
@@ -73,8 +76,3 @@ test:
         [ -d "/opt/metrics-collector/lib/collectd/lib/" ] || exit 1
         [ -d "/opt/metrics-collector/lib/collectd/etc/" ] || exit 1
         [ -d "/opt/metrics-collector/lib/collectd/usr/" ] || exit 1
-    # Will fail see https://github.com/wolfi-dev/os/issues/34356
-    # - uses: test/pkgconf
-    - uses: test/ldd-check
-      with:
-        packages: ${{package.name}}
diff --git a/metric-collector-for-apache-cassandra-4.1/collectd-download-url-fix.patch b/metric-collector-for-apache-cassandra-4.1/collectd-download-url-fix.patch
deleted file mode 100644
index 98c9fc49a7b..00000000000
--- a/metric-collector-for-apache-cassandra-4.1/collectd-download-url-fix.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-# Upstream re-located one of their dependencies to another repository. They have
-# fixed this in commit: 13922679209b9836554a292a68476aba41d1999c. However there
-# have not been any new release  tags cut as yet. As soon as there is a new
-# release cut, this can be removed.
-diff --git a/pom.xml b/pom.xml
-index 25f2d82..7d2e30c 100755
---- a/pom.xml
-+++ b/pom.xml
-@@ -192,7 +192,7 @@
-                             <goal>wget</goal>
-                         </goals>
-                         <configuration>
--                            <url>https://github.com/riptano/collectd/releases/download/v${collectd.version}/insights-collectd-${collectd.version}.tar.gz</url>
-+                            <url>https://github.com/datastax/collectd/releases/download/v${collectd.version}/insights-collectd-${collectd.version}.tar.gz</url>
-                             <unpack>true</unpack>
-                             <outputDirectory>target</outputDirectory>
-                         </configuration>