diff --git a/distro/f38.ipp.yml b/distro/f38.ipp.yml
new file mode 100644
index 0000000..e280fad
--- /dev/null
+++ b/distro/f38.ipp.yml
@@ -0,0 +1,58 @@
+version: '2'
+mpp-vars:
+  distro_name: f38
+  distro_version: 38
+  distro_baseurl: http://download.fedoraproject.org/pub/fedora/linux/
+  distro_baseurl_repo: $distro_baseurl/updates/$distro_version/Everything/$arch/
+  osname: fedora
+  uefi_vendor: fedora
+  kernel_package: kernel
+  release_rpm: fedora-release
+  linux_firmware_rpm: linux-firmware
+  distro_repos:
+  - id: fedora
+    baseurl: $distro_baseurl/releases/$distro_version/Everything/$arch/os/
+  - id: fedora-updates
+    baseurl: $distro_baseurl/updates/$distro_version/Everything/$arch/
+  - id: next
+    baseurl: https://download.copr.fedorainfracloud.org/results/@centos-automotive-sig/next/fedora-38-$arch/
+  distro_devel_repos:
+  - id: fedora-updates-devel
+    baseurl: $distro_baseurl/updates/$distro_version/Everything/$arch/
+  - id: next-devel
+    baseurl: https://download.copr.fedorainfracloud.org/results/@centos-automotive-sig/next/fedora-38-$arch/
+  distro_debug_repos:
+  - id: next-debug
+    baseurl: https://download.copr.fedorainfracloud.org/results/@centos-automotive-sig/next/fedora-38-$arch/
+  distro_module_id: platform:f38
+  distro_gpg_keys: |
+    -----BEGIN PGP PUBLIC KEY BLOCK-----
+    Comment: GPG-KEY-fedora-38
+    
+    mQINBGIC2cYBEADJye1aE0AR17qwj6wsHWlCQlcihmqkL8s4gbOk1IevBbH4iXJx
+    lu6bN+NhTcCCX6eHmaL5Pwb/bpkMmLR+/r1D2cLDK24YzvN6kJnwRQUTf2dbqYmg
+    mNBgIMm+kAabBZPwUHUzyQ9CT/WJpYr1OYu8JIkdxF35nrPewnnOUUqxqbi8fXRQ
+    gskSLF8UveiOjFIqmWwlPwT1UtnevAaF80UGQlkwFvqjjh4b9vKY2gHMAQwt+wg5
+    HFFCSwSrnd88ZoDb3pKvDMeurYUiPzF5f2r+ziVkMuaSNckvp58uge7HvyqQPAdJ
+    ZRswCCxhUAo9VqkNfB4Ud25ASyalk9jOE3HB8E35gFfPXvuX1n15THXNcwMEiybk
+    Omne2YwXL8ShGNr5otjqywThMrrqcl2g/pJVTcpDHTR5Hn9YRp+GHlYLjyEr+/x7
+    xM19y9ca9GUiJqDbEREHcKKIhYiGmcIjjcJvei/3C/aM4pqeGFJBbVSnw3qeMxH/
+    6ArAMA1sAdShCkv2YjlcF0r4uoCjXdS3xrKLz9PSCquot7RySnOE9TZ7flfJll7Z
+    q+lNaSeJg7FK8VWSUb9Lit6VEYVbzWKzespDDbujrHbFpydyq8gXurk7bSR2w0te
+    gsmytQqT/w1z2bydgGF6SfY9Px0wuA8GQKr48l5Bhdc6+vHHFqPKzz0PVQARAQAB
+    tDFGZWRvcmEgKDM4KSA8ZmVkb3JhLTM4LXByaW1hcnlAZmVkb3JhcHJvamVjdC5v
+    cmc+iQJOBBMBCAA4FiEEalG7q7o9VGe2FxIhgJqNfOsQtGQFAmIC2cYCGw8FCwkI
+    BwIGFQoJCAsCBBYCAwECHgECF4AACgkQgJqNfOsQtGScyw/7BLmD4Fwi4QZY94zl
+    vlJdNufZRavOemSIVVDHoCr8pQBAdrvoMypxJd5zM4ODIqFsjdYpFti+Tkeq4/4U
+    25UoLPEOtU8UDt2uq7LqfdCxspaj7VyXAJIkpf7wEvLS4Jzo+YaMIlsd0dCrMXTM
+    vhu4gKpBFW6C+gGlmuDyTJbyrf7ilytgVzVtIfRrT7XffylviIlZHwKm43UDjvzX
+    YEl3EAFR1RjATwXMy2aJh7GCNsz+fKs+7YRKQUhpMF5un/2pyNJO+LbVGGwGZvga
+    K9Kfsg/4r1ync4nDDD1dadKIHhobDeiJ9uZLoBvvVDz7Ywu7q/vv4zIPxstYBNq4
+    6fLKDtYXuJCK0EV9Qy4ox67t0UGlaRGH8y5YUqOI10xH7iQej0xWlSc8w2dKhPz8
+    z9XLv2OMK+PvqvflhFHhWkqEoQRqTu0TVD0fLLe4lqieJlqZcJqW0F9G/vNSSWmf
+    POLa/Nim71gL2fPjCJOIRV4K/cJSyBmu5NchG7dHD5sUtJxZ4TFSuepaBZ8cPK1x
+    e26TaCBqoUWgUXWmw+P89aOpYOJYEFfT/VAm2Ywn+c1EFUmD+30wQ7aP/RUFl94z
+    n0BjqsWDnCKVFHydZ0TZSpeADmXMg2VYZPcp/cQR1KjoBoDxAscis7b1XPQUg7CB
+    zquq5jBVAnsNIhs7g47GWKyDUJM=
+    =aCLl
+    -----END PGP PUBLIC KEY BLOCK-----
diff --git a/images/container.mpp.yml b/images/container.mpp.yml
index e935d0f..c7111b2 100644
--- a/images/container.mpp.yml
+++ b/images/container.mpp.yml
@@ -18,6 +18,7 @@ pipelines:
       gpgkeys:
       - mpp-eval: centos_gpg_key
       - mpp-eval: redhat_gpg_key
+      - mpp-eval: distro_gpg_keys
       disable_dracut: true
     inputs:
       packages:
@@ -33,15 +34,13 @@ pipelines:
             - mpp-eval: distro_repos
             - mpp-eval: target_repos
             - mpp-eval: extra_repos
-            - - id: copr-podman
-                baseurl: https://download.copr.fedorainfracloud.org/results/alexl/podman-snapshot/centos-stream-9-x86_64/
           packages:
             mpp-join:
             - mpp-eval: base_rpms
             - mpp-eval: image_rpms
             - mpp-eval: extra_rpms
             - - podman
-              - podman-quadlet
+              - containernetworking-plugins
               - curl
           excludes:
           - dracut-config-rescue
diff --git a/images/minimal.mpp.yml b/images/minimal.mpp.yml
index 84f5f8e..ff16562 100644
--- a/images/minimal.mpp.yml
+++ b/images/minimal.mpp.yml
@@ -18,6 +18,7 @@ pipelines:
       gpgkeys:
       - mpp-eval: centos_gpg_key
       - mpp-eval: redhat_gpg_key
+      - mpp-eval: distro_gpg_keys
       disable_dracut: true
       exclude:
         docs: true
diff --git a/include/build.ipp.yml b/include/build.ipp.yml
index f858218..ec1c498 100644
--- a/include/build.ipp.yml
+++ b/include/build.ipp.yml
@@ -37,6 +37,7 @@ pipelines:
       gpgkeys:
       - mpp-eval: centos_gpg_key
       - mpp-eval: redhat_gpg_key
+      - mpp-eval: distro_gpg_keys
       exclude:
         docs: true
   - type: org.osbuild.selinux
diff --git a/include/defaults.ipp.yml b/include/defaults.ipp.yml
index 12efd08..7a35c54 100644
--- a/include/defaults.ipp.yml
+++ b/include/defaults.ipp.yml
@@ -53,6 +53,9 @@ mpp-vars:
   default_dracut_install: []
   default_ostree_repo_url: http://10.0.2.100/
   default_ostree_remote_name: auto-sig
+  default_distro_gpg_keys: ""
+  distro_gpg_keys:
+    mpp-eval: locals().get('distro_gpg_keys', default_distro_gpg_keys)
   target:
     mpp-eval: locals().get('target', default_target)
   image_type: