diff --git a/eclipse-rhel8.yaml b/eclipse.yaml
similarity index 84%
rename from eclipse-rhel8.yaml
rename to eclipse.yaml
index 02fdaa6..918bde6 100644
--- a/eclipse-rhel8.yaml
+++ b/eclipse.yaml
@@ -2,12 +2,11 @@
 document: modulemd
 version: 2
 data:
-    name: eclipse
     stream: rhel8
     summary: An open, extensible IDE and application platform
     description: >-
         The Eclipse platform is designed for building integrated development
-        environments (IDEs), desktop applications, and
+        environments (IDEs), server-side applications, desktop applications, and
         everything in between.
     license:
         module:
@@ -127,196 +126,196 @@ data:
         rpms:
             eclipse:
                 buildorder: 40
-                ref: c8s-stream-rhel8
+                ref: stream-eclipse-rhel8-rhel-8.8.0
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
                     Module API.
             eclipse-ecf:
                 buildorder: 30
-                ref: c8s-stream-rhel8
+                ref: stream-eclipse-rhel8-rhel-8.2.1
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
                     Runtime dependency of eclipse.
             eclipse-emf:
                 buildorder: 20
-                ref: c8s-stream-rhel8
+                ref: stream-eclipse-rhel8-rhel-8.2.1
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
                     Runtime dependency of eclipse, eclipse-ecf.
             apache-commons-compress:
                 buildorder: 20
-                ref: c8s-stream-rhel8
+                ref: stream-eclipse-rhel8-rhel-8.2.1
                 arches: [x86_64]
                 rationale: >
                     Runtime dependency of jgit, jython.
             apache-commons-jxpath:
                 buildorder: 10
-                ref: c8s-stream-rhel8
+                ref: stream-eclipse-rhel8-rhel-8.2.1
                 arches: [x86_64]
                 rationale: >
                     Runtime dependency of eclipse.
             apiguardian:
                 buildorder: 10
-                ref: c8s-stream-rhel8
+                ref: stream-eclipse-rhel8-rhel-8.2.1
                 arches: [x86_64]
                 rationale: >
                     Runtime dependency of eclipse, junit5.
             batik:
                 buildorder: 20
-                ref: c8s-stream-rhel8
+                ref: stream-eclipse-rhel8-rhel-8.2.1
                 arches: [x86_64]
                 rationale: >
                     Runtime dependency of eclipse.
             felix-gogo-command:
                 buildorder: 20
-                ref: c8s-stream-rhel8
+                ref: stream-eclipse-rhel8-rhel-8.2.1
                 arches: [x86_64]
                 rationale: >
                     Runtime dependency of eclipse.
             felix-gogo-runtime:
                 buildorder: 10
-                ref: c8s-stream-rhel8
+                ref: stream-eclipse-rhel8-rhel-8.2.1
                 arches: [x86_64]
                 rationale: >
                     Runtime dependency of eclipse, felix-gogo-command,
                          felix-gogo-shell.
             felix-gogo-shell:
                 buildorder: 20
-                ref: c8s-stream-rhel8
+                ref: stream-eclipse-rhel8-rhel-8.2.1
                 arches: [x86_64]
                 rationale: >
                     Runtime dependency of eclipse.
             felix-scr:
                 buildorder: 30
-                ref: c8s-stream-rhel8
+                ref: stream-eclipse-rhel8-rhel-8.2.1
                 arches: [x86_64]
                 rationale: >
                     Runtime dependency of eclipse.
             glassfish-annotation-api:
                 buildorder: 10
-                ref: c8s-stream-rhel8
+                ref: stream-eclipse-rhel8-rhel-8.2.1
                 arches: [x86_64]
                 rationale: >
                     Runtime dependency of eclipse.
             glassfish-el:
                 buildorder: 10
-                ref: c8s-stream-rhel8
+                ref: stream-eclipse-rhel8-rhel-8.2.1
                 arches: [x86_64]
                 rationale: >
                     Runtime dependency of eclipse, glassfish-jsp-api.
             glassfish-jsp:
                 buildorder: 30
-                ref: c8s-stream-rhel8
+                ref: stream-eclipse-rhel8-rhel-8.2.1
                 arches: [x86_64]
                 rationale: >
                     Runtime dependency of eclipse.
             glassfish-jsp-api:
                 buildorder: 20
-                ref: c8s-stream-rhel8
+                ref: stream-eclipse-rhel8-rhel-8.2.1
                 arches: [x86_64]
                 rationale: >
                     Runtime dependency of eclipse, glassfish-jsp.
             glassfish-servlet-api:
                 buildorder: 10
-                ref: c8s-stream-rhel8
+                ref: stream-eclipse-rhel8-rhel-8.2.1
                 arches: [x86_64]
                 rationale: >
                     Runtime dependency of eclipse, glassfish-jsp-api, jetty.
             google-gson:
                 buildorder: 10
-                ref: c8s-stream-rhel8
+                ref: stream-eclipse-rhel8-rhel-8.2.1
                 arches: [x86_64]
                 rationale: >
                     Runtime dependency of eclipse, eclipse-cdt, jgit,
                          eclipse-m2e-core, eclipse-webtools.
             hamcrest:
                 buildorder: 10
-                ref: c8s-stream-rhel8
+                ref: stream-eclipse-rhel8-rhel-8.2.1
                 arches: [x86_64]
                 rationale: >
                     Runtime dependency of eclipse, junit.
             icu4j:
                 buildorder: 10
-                ref: c8-stream-rhel8
+                ref: stream-eclipse-rhel8-rhel-8.2.1
                 arches: [x86_64]
                 rationale: >
                     Runtime dependency of eclipse, jython.
             jetty:
                 buildorder: 20
-                ref: c8s-stream-rhel8
+                ref: stream-eclipse-rhel8-rhel-8.2.1
                 arches: [x86_64]
                 rationale: >
                     Runtime dependency of eclipse, jgit,
                          eclipse-m2e-core, eclipse-webtools.
             jsch:
                 buildorder: 20
-                ref: c8s-stream-rhel8
+                ref: stream-eclipse-rhel8-rhel-8.2.1
                 arches: [x86_64]
                 rationale: >
                     Runtime dependency of eclipse, jgit.
             junit:
                 buildorder: 20
-                ref: c8s-stream-rhel8
+                ref: stream-eclipse-rhel8-rhel-8.2.1
                 arches: [x86_64]
                 rationale: >
                     Runtime dependency of eclipse, junit5.
             junit5:
                 buildorder: 30
-                ref: c8s-stream-rhel8
+                ref: stream-eclipse-rhel8-rhel-8.2.1
                 arches: [x86_64]
                 rationale: >
                     Runtime dependency of eclipse.
             jzlib:
                 buildorder: 10
-                ref: c8s-stream-rhel8
+                ref: stream-eclipse-rhel8-rhel-8.2.1
                 arches: [x86_64]
                 rationale: >
                     Runtime dependency of jgit, jsch.
             lucene:
                 buildorder: 10
-                ref: c8s-stream-rhel8
+                ref: stream-eclipse-rhel8-rhel-8.2.1
                 arches: [x86_64]
                 rationale: >
                     Runtime dependency of eclipse, eclipse-m2e-core, maven-indexer.
             objectweb-asm:
                 buildorder: 10
-                ref: c8s-stream-rhel8
+                ref: stream-eclipse-rhel8-rhel-8.2.1
                 arches: [x86_64]
                 rationale: >
                     Runtime dependency of eclipse, eclipse-ecf, jython.
             opentest4j:
                 buildorder: 10
-                ref: c8s-stream-rhel8
+                ref: stream-eclipse-rhel8-rhel-8.2.1
                 arches: [x86_64]
                 rationale: >
                     Runtime dependency of eclipse, junit5.
             sat4j:
                 buildorder: 10
-                ref: c8s-stream-rhel8
+                ref: stream-eclipse-rhel8-rhel-8.2.1
                 arches: [x86_64]
                 rationale: >
                     Runtime dependency of eclipse.
             univocity-parsers:
                 buildorder: 10
-                ref: c8s-stream-rhel8
+                ref: stream-eclipse-rhel8-rhel-8.2.1
                 arches: [x86_64]
                 rationale: >
                     Runtime dependency of junit5.
             xml-commons-apis:
                 buildorder: 10
-                ref: c8s-stream-rhel8
+                ref: stream-eclipse-rhel8-rhel-8.2.1
                 arches: [x86_64]
                 rationale: >
                     Runtime dependency of batik, eclipse, eclipse-emf.
             xmlgraphics-commons:
                 buildorder: 10
-                ref: c8s-stream-rhel8
+                ref: stream-eclipse-rhel8-rhel-8.2.1
                 arches: [x86_64]
                 rationale: >
                     Runtime dependency of batik.
             xz-java:
                 buildorder: 10
-                ref: c8s-stream-rhel8
+                ref: stream-eclipse-rhel8-rhel-8.2.1
                 arches: [x86_64]
                 rationale: >
                     Runtime dependency of eclipse, apache-commons-compress.
diff --git a/gating.yaml b/gating.yaml
new file mode 100644
index 0000000..7f9f40a
--- /dev/null
+++ b/gating.yaml
@@ -0,0 +1,8 @@
+--- !Policy
+product_versions:
+  - rhel-8
+decision_context: osci_compose_gate_modules
+subject_type: redhat-module
+rules:
+  - !PassingTestCaseRule {test_case_name: baseos-ci.redhat-module.tier0.functional}
+
diff --git a/tests/tests.yml b/tests/tests.yml
new file mode 100644
index 0000000..38a99a1
--- /dev/null
+++ b/tests/tests.yml
@@ -0,0 +1,13 @@
+---
+- hosts: localhost
+  roles:
+  - role: standard-test-basic
+    tags:
+    - classic
+    tests:
+      - eclipseBuildId:
+          dir: ~
+          run: set -ex; useradd -m myuser; echo -e 'props\nexit\ny\n' | su - myuser -c 'eclipse -noexit -console -nosplash' | grep eclipse.buildId
+    required_packages:
+    - eclipse-platform
+