diff --git a/.fmf/version b/.fmf/version
deleted file mode 100644
index d00491f..0000000
--- a/.fmf/version
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/.gitignore b/.gitignore
index 3e59ecd..a72ee9a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1 @@
-/valkey-7.2.5.tar.gz
-/valkey-7.2.6.tar.gz
-/valkey-8.0.2.tar.gz
-/valkey-8.0.3.tar.gz
-/valkey-8.0.4.tar.gz
-/valkey-8.0.6.tar.gz
+SOURCES/valkey-8.0.6.tar.gz
diff --git a/.valkey.metadata b/.valkey.metadata
new file mode 100644
index 0000000..8d23d26
--- /dev/null
+++ b/.valkey.metadata
@@ -0,0 +1 @@
+f0b1d37036376aac07c261326983f87f65781e9a SOURCES/valkey-8.0.6.tar.gz
diff --git a/macros.valkey b/SOURCES/macros.valkey
similarity index 100%
rename from macros.valkey
rename to SOURCES/macros.valkey
diff --git a/migrate_redis_to_valkey.sh b/SOURCES/migrate_redis_to_valkey.sh
similarity index 100%
rename from migrate_redis_to_valkey.sh
rename to SOURCES/migrate_redis_to_valkey.sh
diff --git a/valkey-cve-2025-27151.patch b/SOURCES/valkey-cve-2025-27151.patch
similarity index 100%
rename from valkey-cve-2025-27151.patch
rename to SOURCES/valkey-cve-2025-27151.patch
diff --git a/valkey-sentinel.service b/SOURCES/valkey-sentinel.service
similarity index 100%
rename from valkey-sentinel.service
rename to SOURCES/valkey-sentinel.service
diff --git a/valkey.logrotate b/SOURCES/valkey.logrotate
similarity index 100%
rename from valkey.logrotate
rename to SOURCES/valkey.logrotate
diff --git a/valkey.service b/SOURCES/valkey.service
similarity index 100%
rename from valkey.service
rename to SOURCES/valkey.service
diff --git a/valkey.sysusers b/SOURCES/valkey.sysusers
similarity index 100%
rename from valkey.sysusers
rename to SOURCES/valkey.sysusers
diff --git a/valkey.tmpfiles b/SOURCES/valkey.tmpfiles
similarity index 100%
rename from valkey.tmpfiles
rename to SOURCES/valkey.tmpfiles
diff --git a/valkey.spec b/SPECS/valkey.spec
similarity index 99%
rename from valkey.spec
rename to SPECS/valkey.spec
index 169d83a..47c02ca 100644
--- a/valkey.spec
+++ b/SPECS/valkey.spec
@@ -271,7 +271,7 @@ taskset -c 1 ./runtest --clients 50 --skiptest "Active defrag - AOF loading"
 * Fri Oct 17 2025 Remi Collet <remi@fedoraproject.org> - 8.0.6-2
 - rebase to 8.0.6 for CVE-2025-49844 CVE-2025-46817 CVE-2025-46818 CVE-2025-46819
 
-* Mon Sep  8 2025 Remi Collet <remi@fedoraproject.org> - 8.0.4-3
+* Tue Sep  9 2025 Remi Collet <remi@fedoraproject.org> - 8.0.4-3
 - fix ImageMode: ensure ownership of /etc/valkey
 
 * Fri Aug  1 2025 Remi Collet <remi@fedoraproject.org> - 8.0.4-2
diff --git a/ci.fmf b/ci.fmf
deleted file mode 100644
index c5aa0e0..0000000
--- a/ci.fmf
+++ /dev/null
@@ -1 +0,0 @@
-resultsdb-testcase: separate
diff --git a/gating.yaml b/gating.yaml
deleted file mode 100644
index 7da9094..0000000
--- a/gating.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-#gating rhel
---- !Policy
-product_versions:
-  - rhel-*
-decision_context: osci_compose_gate
-rules:
-  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/tier1-internal.functional}
diff --git a/plans/tier1-internal.fmf b/plans/tier1-internal.fmf
deleted file mode 100644
index 39ba722..0000000
--- a/plans/tier1-internal.fmf
+++ /dev/null
@@ -1,10 +0,0 @@
-summary: Internal Tier1 beakerlib tests
-discover:
-    how: fmf
-    url: https://gitlab.com/redhat/rhel/tests/valkey
-    filter: "tier:1"
-execute:
-    how: tmt
-adjust:
-    enabled: false
-    when: distro == centos-stream-10
diff --git a/sources b/sources
deleted file mode 100644
index 4fa0d30..0000000
--- a/sources
+++ /dev/null
@@ -1 +0,0 @@
-SHA512 (valkey-8.0.6.tar.gz) = 0f704ad06abab2817657abe60be6fb7c45df91cdaaa53d921e26c6f4e91a3712152a31550b876d8deba3493a6ca4b87194efd3a86cacd53906f01e845e7cb137