diff --git a/container.yaml b/container.yaml
new file mode 100644
index 0000000..74f3379
--- /dev/null
+++ b/container.yaml
@@ -0,0 +1,18 @@
+compose:
+    modules:
+        - eog:master
+flatpak:
+    id: org.gnome.eog
+    branch: stable
+    command: eog
+    tags: ["Viewer"]
+    finish-args: >
+        --filesystem=host
+        --share=ipc
+        --socket=x11
+        --socket=wayland
+        --socket=session-bus
+        --filesystem=~/.config/dconf:ro
+        --filesystem=xdg-run/dconf
+        --talk-name=ca.desrt.dconf
+        --env=DCONF_USER_CONFIG_DIR=.config/dconf
diff --git a/eog.yaml b/eog.yaml
index e5f0d16..ed09e94 100644
--- a/eog.yaml
+++ b/eog.yaml
@@ -2,20 +2,17 @@ document: modulemd
 version: 1
 data:
     summary: Eye of GNOME Application Module
-    description:  The Eye of GNOME image viewer (eog) is the official image viewer for the
-       GNOME desktop. It can view single image files in a variety of formats, as
-       well as large image collections.
+    description: >
+        The Eye of GNOME image viewer (eog) is the official image viewer for the
+        GNOME desktop. It can view single image files in a variety of formats, as
+        well as large image collections.
     license:
         module: [ MIT ]
     dependencies:
         buildrequires:
-            flatpak-runtime: f26
-            base-runtime: f26
-            perl: f26
-            common-build-dependencies: f26
-            shared-userspace: f26
+            flatpak-runtime: f28
         requires:
-            flatpak-runtime: f26
+            flatpak-runtime: f28
     profiles:
         default:
             rpms:
@@ -24,25 +21,14 @@ data:
 #                - libpeas-loader-python3
     components:
         rpms:
+            bubblewrap:
+                rationale: Runtime dependency.
             eog:
-                rationale: Core application
-                ref: f26
-                buildorder: 3
-            exempi:
-                rationale: Dependency
-                ref: f26
-                buildorder: 2
-            libexif:
-                rationale: Dependency
-                ref: f26
-                buildorder: 2
-            glade:
-                # Could be conditionaled out in libpeas - this is just to find a location
-                # to install a glade catalog file.
-                rationale: Build dependency for libpeas
-                ref: f26
                 buildorder: 1
+                rationale: Runtime dependency.
+            exempi:
+                rationale: Runtime dependency.
+            gnome-desktop3:
+                rationale: Runtime dependency.
             libpeas:
-                rationale: Dependency
-                ref: f26
-                buildorder: 2
+                rationale: Runtime dependency.
diff --git a/flatpak.json b/flatpak.json
deleted file mode 100644
index e228522..0000000
--- a/flatpak.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-        "id": "org.gnome.eog",
-        "version": "3.20.0-2.fc26",
-        "runtime": "org.fedoraproject.Platform",
-        "runtime-version": "26",
-        "sdk": "org.fedoraproject.Sdk",
-        "command": "eog",
-        "tags": ["Viewer"],
-        "finish-args": ["--filesystem=host",
-                        "--share=ipc",
-                        "--socket=x11",
-                        "--socket=wayland",
-                        "--socket=session-bus",
-                        "--filesystem=~/.config/dconf:ro",
-                        "--filesystem=xdg-run/dconf",
-                        "--talk-name=ca.desrt.dconf",
-                        "--env=DCONF_USER_CONFIG_DIR=.config/dconf"]
-}