diff --git a/postgres/codenamemap.yaml b/postgres/codenamemap.yaml
index e3f26fb..59a989a 100644
--- a/postgres/codenamemap.yaml
+++ b/postgres/codenamemap.yaml
@@ -2,19 +2,14 @@
 
 {% import_yaml "postgres/repo.yaml" as repo %}
 
-{% macro debian_codename(name, version, codename=none) %}
-  {#
-  Generate lookup dictionary map for Debian and derivative distributions
-
-    name:
-      distro codename
-    version:
-      PostgreSQL release version
-    codename:
-      optional grain value if `name` does not match the one returned by
-      `oscodename` grain
+  {# Generate lookup dictionary map for OS and derivative distributions
+    name: distro codename
+    version: PostgreSQL release version
+    codename: optional grain value if `name` does not match the one returned by `oscodename` grain
   #}
 
+{% macro debian_codename(name, version, codename=none) %}
+
   {# use upstream version if configured #}
   {% if repo.use_upstream_repo == true %}
     {% set version = repo.version %}
@@ -40,21 +35,13 @@
 
 
 {% macro fedora_codename(name, version, codename=none) %}
-  {#
-  Generate lookup dictionary map for Fedora distributions
-
-    name:
-      distro codename
-    version:
-      PostgreSQL release version
-    codename:
-      optional grain value if `name` does not match the one returned by
-      `oscodename` grain
-  #}
 
   {# use upstream version if configured #}
   {% if repo.use_upstream_repo == true %}
+    {% set fromrepo = repo.fromrepo or name + '-pgdg' %}
     {% set version = repo.version %}
+  {% else %}
+    {% set fromrepo = name %}
   {% endif %}
 
 {{ codename|default(name, true) }}: