diff --git a/community_images/concourse/official/image.yml b/community_images/concourse/official/image.yml
new file mode 100644
index 000000000..1ebd9d4de
--- /dev/null
+++ b/community_images/concourse/official/image.yml
@@ -0,0 +1,36 @@
+name: concourse-official
+official_name: Concourse Official
+official_website: https://concourse-ci.org/
+source_image_provider: Concourse
+source_image_repo: docker.io/concourse/concourse
+source_image_repo_link: https://hub.docker.com/r/concourse/concourse
+source_image_readme: https://github.com/concourse/concourse/blob/master/README.md
+rf_docker_link: rapidfort/concourse-official
+image_workflow_name: concourse_official
+github_location: concourse/official
+report_url: https://us01.rapidfort.com/app/community/imageinfo/docker.io%2Fconcourse%2Fconcourse
+usage_instructions: |
+  # Using Docker Run:
+  $docker run --detach --name concourse --privileged --publish 8080:8080 concourse/concourse quickstart --add-local-user test:test --main-team-local-user test
+  # Note: Concourse requires a running PostgreSQL instance to start.
+what_is_text: |
+  Concourse is an open-source continuous thing-doer. Built on the simple mechanics of resources, tasks, and jobs, Concourse presents a general approach to automation that makes it great for CI/CD.
+disclaimer: |
+  Trademarks: This software listing is packaged by RapidFort. The respective trademarks mentioned in the offering are owned by the respective companies, and use of them does not imply any affiliation or endorsement.
+use_rapid_stub: true
+is_locked: "False"
+input_registry:
+  registry: docker.io
+  account: concourse
+repo_sets:
+  - concourse:
+      input_base_tag: "7.12."
+      output_repo: concourse-official
+runtimes:
+  - type: docker_compose
+    script: dc_coverage.sh
+    compose_file: docker-compose.yml
+    image_keys:
+      concourse-official:
+        repository: "CONCOURSE_IMAGE_REPOSITORY"
+        tag: "CONCOURSE_IMAGE_TAG"
diff --git a/community_images/couchdb/official/image.yml b/community_images/couchdb/official/image.yml
index 6542cec8b..4f51adf8a 100644
--- a/community_images/couchdb/official/image.yml
+++ b/community_images/couchdb/official/image.yml
@@ -18,19 +18,11 @@ disclaimer: |
 docker_links:
   - "[`latest`, `3.3.3`, `3.3`, `3`](https://github.com/apache/couchdb-docker/blob/58910ed097489dc588b2a87592406f8faa1bdadf/3.3.3/Dockerfile)"
   - "[`3.2.3`, `3.2`](https://github.com/apache/couchdb-docker/blob/58910ed097489dc588b2a87592406f8faa1bdadf/3.2.3/Dockerfile)"
-  - "[`3.1.2`, `3.1`](https://github.com/apache/couchdb-docker/blob/58910ed097489dc588b2a87592406f8faa1bdadf/3.1.2/Dockerfile)"
-  - "[`2.3.1`, `2.3`, `2`](https://github.com/apache/couchdb-docker/blob/58910ed097489dc588b2a87592406f8faa1bdadf/2.3.1/Dockerfile)"
 input_registry:
   registry: docker.io
   account: library
 is_locked: "False"
 repo_sets:
-  - couchdb:
-      input_base_tag: "2.3."
-      output_repo: couchdb-official
-  - couchdb:
-      input_base_tag: "3.1."
-      output_repo: couchdb-official
   - couchdb:
       input_base_tag: "3.2."
       output_repo: couchdb-official
diff --git a/community_images/mariadb/official/image.yml b/community_images/mariadb/official/image.yml
index a539bc0bf..7ffe82bc9 100644
--- a/community_images/mariadb/official/image.yml
+++ b/community_images/mariadb/official/image.yml
@@ -48,7 +48,7 @@ repo_sets:
 runtimes:
   - type: docker
     script: docker_coverage.sh
-    wait_time_sec: 10
+    wait_time_sec: 5
     mariadb-official:
       exec_command: --default-authentication-plugin=mysql_native_password
       environment: