diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f9295cd360c4325d8eb2654d3269caa8c5a0b975..ae6d56e0454a96a09112e648e3eb6408558269b7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,11 +6,13 @@ image:
 variables:
   GIT_SUBMODULE_STRATEGY: recursive
 
-#test:
-#  script:
-#  - hugo
-#  except:
-#  - main
+test:
+  tags:
+    - pages-builder
+  script:
+  - hugo
+  except:
+  - main
 
 pages:
   tags:
diff --git a/content/index.md b/content/_index.md
similarity index 98%
rename from content/index.md
rename to content/_index.md
index c398c8af02e87a8202fa93d18f51fd14b7292f69..41ae4f6bacd4c3fe750a2840791f2ca51eacfab7 100644
--- a/content/index.md
+++ b/content/_index.md
@@ -38,7 +38,7 @@ The Governing Body comprises a group of industry experts to ensure that market i
 
 ### Governing Body Members
 
-{{< imagegrid columns="3" data="members.governing_body">}}
+{{< imagegrid columns="3" data="members.governing_body" media_page="headless_media" >}}
 
 ### SOAFEE Steering Committees 
 
diff --git a/content/images/arm.png b/content/headless_media/images/arm.png
similarity index 100%
rename from content/images/arm.png
rename to content/headless_media/images/arm.png
diff --git a/content/images/aws.png b/content/headless_media/images/aws.png
similarity index 100%
rename from content/images/aws.png
rename to content/headless_media/images/aws.png
diff --git a/content/images/bosch.png b/content/headless_media/images/bosch.png
similarity index 100%
rename from content/images/bosch.png
rename to content/headless_media/images/bosch.png
diff --git a/content/images/continental.jpg b/content/headless_media/images/continental.jpg
similarity index 100%
rename from content/images/continental.jpg
rename to content/headless_media/images/continental.jpg
diff --git a/content/images/redhat.png b/content/headless_media/images/redhat.png
similarity index 100%
rename from content/images/redhat.png
rename to content/headless_media/images/redhat.png
diff --git a/content/images/suse.png b/content/headless_media/images/suse.png
similarity index 100%
rename from content/images/suse.png
rename to content/headless_media/images/suse.png
diff --git a/content/images/woven_planet.png b/content/headless_media/images/woven_planet.png
similarity index 100%
rename from content/images/woven_planet.png
rename to content/headless_media/images/woven_planet.png
diff --git a/content/headless_media/index.md b/content/headless_media/index.md
new file mode 100644
index 0000000000000000000000000000000000000000..a199fbf0199ef6993bc6f55f8bd6e69ec1d329b4
--- /dev/null
+++ b/content/headless_media/index.md
@@ -0,0 +1,10 @@
+---
+headless: true
+---
+
+This is a headless page resource.
+
+https://gohugo.io/content-management/page-bundles/#headless-bundle
+
+It will not be published, but is a page bundle that
+can be referenced by other pages.
\ No newline at end of file
diff --git a/content/images/Logo-redhat-color-375.png b/content/images/Logo-redhat-color-375.png
deleted file mode 100644
index 3b85b90fd75aa48aaecc6692fdad2992a37999fa..0000000000000000000000000000000000000000
Binary files a/content/images/Logo-redhat-color-375.png and /dev/null differ
diff --git a/themes/soafee/layouts/shortcodes/imagegrid.html b/themes/soafee/layouts/shortcodes/imagegrid.html
index c15962c75c03de97b6771b7ce0c0d4433d843d60..251674af3260cecab463d05ca218860a9b17563b 100644
--- a/themes/soafee/layouts/shortcodes/imagegrid.html
+++ b/themes/soafee/layouts/shortcodes/imagegrid.html
@@ -13,6 +13,10 @@
 {{ $padLeft := math.Floor $numToPad }}
 {{ $padRight := math.Ceil $numToPad }}
 
+
+{{ $mediaPage := .Get "media_page" | default .Page.File.Path }}
+{{ $resourcesPage := .Site.GetPage $mediaPage }}
+
 <div class="imagegrid row">
     {{ range index .Site.Data (split .Params.data "." ) }}
         {{ $row = div $index $columns}}
@@ -26,9 +30,8 @@
             {{ end }}
         {{ end }}
 
-        
-        {{ $image := $.Page.Resources.GetMatch .image }}
-        {{ $placeholder := $image.Fit "600x300"}} 
+        {{ $image := $resourcesPage.Resources.GetMatch .image }}
+        {{ $placeholder := $image.Fit "600x300" }} 
 
         <div class="col-md">
             <a href="{{.url}}" style="width:100%">