diff --git a/community_images/pgbouncer/official/image.yml b/community_images/pgbouncer/official/image.yml
new file mode 100755
index 0000000000..8bbeb4b0d4
--- /dev/null
+++ b/community_images/pgbouncer/official/image.yml
@@ -0,0 +1,34 @@
+name: pgbouncer-official
+official_name: Pgbouncer Official
+official_website: https://www.pgbouncer.org/
+source_image_provider: pgbouncer
+source_image_repo: docker.io/pgbouncer/pgbouncer
+source_image_repo_link: https://hub.docker.com/r/pgbouncer/pgbouncer
+source_image_readme:  https://gitlab.com/aztek-io/oss/containers/pgbouncer-container/-/blob/master/README.md
+rf_docker_link: rapidfort/pgbouncer-official
+image_workflow_name: pgbouncer_official
+github_location: pgbouncer/official
+report_url: https://us01.rapidfort.com/app/community/imageinfo/docker.io%2Fpgbouncer%2Fpgbouncer
+usage_instructions: |
+  # Using Docker run
+  $ docker run -d --name pgbouncer --link postgres:postgres -p 6432:6432 -e DATABASES=yourdb=host=postgres dbname=yourdb user=youruser password=yourpassword rapidfort/pgbouncer-official
+  # Note: Pgbouncer expects a running postgresql instance to connect to. 
+what_is_text: |
+  PgBouncer is a lightweight connection pooler for PostgreSQL. It manages database connections by limiting the number of active connections between an application and a PostgreSQL database, improving scalability and performance. 
+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.
+input_registry:
+  registry: docker.io
+  account: pgbouncer
+repo_sets:
+  - pgbouncer:
+      input_base_tag: "latest"
+      output_repo: pgbouncer-official
+runtimes:
+  - type: docker_compose
+    script: dc_coverage.sh
+    compose_file: docker-compose.yml
+    image_keys:
+      pgbouncer-official:
+        repository: "PGBOUNCER_IMAGE_REPOSITORY"
+        tag: "PGBOUNCER_IMAGE_TAG"
diff --git a/community_images/postgresql/bitnami-ironbank/image.yml b/community_images/postgresql/bitnami-ironbank/image.yml
index fed7b2793e..84d45103d0 100644
--- a/community_images/postgresql/bitnami-ironbank/image.yml
+++ b/community_images/postgresql/bitnami-ironbank/image.yml
@@ -5,7 +5,7 @@ source_image_provider: Platform One
 source_image_repo: registry1.dso.mil/ironbank/bitnami/postgres
 source_image_repo_link: https://registry1.dso.mil/harbor/projects/3/repositories/bitnami%2Fpostgres
 source_image_readme: https://repo1.dso.mil/dsop/bitnami/postgres/postgresql16/-/blob/development/README.md
-rf_docker_link: rapidfort/postgresql-bitnami-ib
+rf_docker_link: rapidfort/postgresql16-bitnami-ib
 image_workflow_name: postgresql_bitnami_ironbank
 github_location: postgresql/bitnami-ironbank
 report_url: https://us01.rapidfort.com/app/community/imageinfo/registry1.dso.mil%2Fironbank%2Fbitnami%2Fpostgres
diff --git a/community_images/tomcat-openjdk8/ironbank/image.yml b/community_images/tomcat-openjdk8/ironbank/image.yml
index d5c95fd255..6b8db8a803 100644
--- a/community_images/tomcat-openjdk8/ironbank/image.yml
+++ b/community_images/tomcat-openjdk8/ironbank/image.yml
@@ -6,7 +6,7 @@ source_image_repo: registry1.dso.mil/ironbank/opensource/apache/tomcat-openjdk8
 source_image_repo_link: https://registry1.dso.mil/harbor/projects/3/repositories/opensource%2Fapache%2Ftomcat-openjdk8
 source_image_readme: https://repo1.dso.mil/dsop/opensource/apache/tomcat-openjdk8/-/blob/development/README.md
 rf_docker_link: rapidfort/tomcat-openjdk8-ib
-github_location: tomcat10/ironbank
+github_location: tomcat-openjdk8/ironbank
 report_url: https://us01.rapidfort.com/app/community/imageinfo/registry1.dso.mil%2Fironbank%2Fopensource%2Fapache%2Ftomcat-openjdk8
 usage_instructions: |
   # Using docker run