point stratum dependencies to the correct branch

24 files changed, 113 insertions, 113 deletions

diff --git a/audio-bluetooth.morph b/audio-bluetooth.morph
index f3fd99c7..69b04726 100644
--- a/audio-bluetooth.morph
+++ b/audio-bluetooth.morph
@@ -6,17 +6,17 @@
         {
             "morph": "core",
             "repo": "baserock:baserock/morphs",
-            "ref": "jonathan/genivi-baseline-merge"
+            "ref": "master"
         },
         {
             "morph": "foundation",
             "repo": "baserock:baserock/morphs",
-            "ref": "jonathan/genivi-baseline-merge"
+            "ref": "master"
         },
         {
             "morph": "genivi-foundation",
             "repo": "baserock:baserock/morphs",
-            "ref": "jonathan/genivi-baseline-merge"
+            "ref": "master"
         }
     ],
     "chunks": [
diff --git a/base-system-armv7-highbank.morph b/base-system-armv7-highbank.morph
index 6d15cd74..22005cb8 100644
--- a/base-system-armv7-highbank.morph
+++ b/base-system-armv7-highbank.morph
@@ -9,22 +9,22 @@
         {
             "morph": "build-essential",
             "repo": "baserock:baserock/morphs",
-            "ref": "jonathan/genivi-baseline-merge"
+            "ref": "master"
         },
         {
             "morph": "core",
             "repo": "baserock:baserock/morphs",
-            "ref": "jonathan/genivi-baseline-merge"
+            "ref": "master"
         },
         {
             "morph": "foundation",
             "repo": "baserock:baserock/morphs",
-            "ref": "jonathan/genivi-baseline-merge"
+            "ref": "master"
         },
         {
             "morph": "bsp-armv7-highbank",
             "repo": "baserock:baserock/morphs",
-            "ref": "jonathan/genivi-baseline-merge"
+            "ref": "master"
         }
     ]
 }
diff --git a/base-system-armv7-versatile.morph b/base-system-armv7-versatile.morph
index 5a339724..04db502d 100644
--- a/base-system-armv7-versatile.morph
+++ b/base-system-armv7-versatile.morph
@@ -9,22 +9,22 @@
         {
             "morph": "build-essential",
             "repo": "baserock:baserock/morphs",
-            "ref": "jonathan/genivi-baseline-merge"
+            "ref": "master"
         },
         {
             "morph": "core",
             "repo": "baserock:baserock/morphs",
-            "ref": "jonathan/genivi-baseline-merge"
+            "ref": "master"
         },
         {
             "morph": "foundation",
             "repo": "baserock:baserock/morphs",
-            "ref": "jonathan/genivi-baseline-merge"
+            "ref": "master"
         },
         {
             "morph": "bsp-armv7-versatile",
             "repo": "baserock:baserock/morphs",
-            "ref": "jonathan/genivi-baseline-merge"
+            "ref": "master"
         }
     ]
 }
diff --git a/base-system-x86_32-generic.morph b/base-system-x86_32-generic.morph
index 38610035..2e29dbe2 100644
--- a/base-system-x86_32-generic.morph
+++ b/base-system-x86_32-generic.morph
@@ -9,22 +9,22 @@
         {
             "morph": "build-essential",
             "repo": "baserock:baserock/morphs",
-            "ref": "jonathan/genivi-baseline-merge"
+            "ref": "master"
         },
         {
             "morph": "core",
             "repo": "baserock:baserock/morphs",
-            "ref": "jonathan/genivi-baseline-merge"
+            "ref": "master"
         },
         {
             "morph": "foundation",
             "repo": "baserock:baserock/morphs",
-            "ref": "jonathan/genivi-baseline-merge"
+            "ref": "master"
         },
         {
             "morph": "bsp-x86_32-generic",
             "repo": "baserock:baserock/morphs",
-            "ref": "jonathan/genivi-baseline-merge"
+            "ref": "master"
         }
     ]
 }
diff --git a/base-system-x86_64-generic.morph b/base-system-x86_64-generic.morph
index 98ffc682..4ae4e713 100644
--- a/base-system-x86_64-generic.morph
+++ b/base-system-x86_64-generic.morph
@@ -9,22 +9,22 @@
         {
             "morph": "build-essential",
             "repo": "baserock:baserock/morphs",
-            "ref": "jonathan/genivi-baseline-merge"
+            "ref": "master"
         },
         {
             "morph": "core",
             "repo": "baserock:baserock/morphs",
-            "ref": "jonathan/genivi-baseline-merge"
+            "ref": "master"
         },
         {
             "morph": "foundation",
             "repo": "baserock:baserock/morphs",
-            "ref": "jonathan/genivi-baseline-merge"
+            "ref": "master"
         },
         {
             "morph": "bsp-x86_64-generic",
             "repo": "baserock:baserock/morphs",
-            "ref": "jonathan/genivi-baseline-merge"
+            "ref": "master"
         }
     ]
 }
diff --git a/connectivity.morph b/connectivity.morph
index cb951c60..282a80e7 100644
--- a/connectivity.morph
+++ b/connectivity.morph
@@ -5,17 +5,17 @@
         {
             "morph": "core",
             "repo": "baserock:baserock/morphs",
-            "ref": "jonathan/genivi-baseline-merge"
+            "ref": "master"
         },
         {
             "morph": "foundation",
             "repo": "baserock:baserock/morphs",
-            "ref": "jonathan/genivi-baseline-merge"
+            "ref": "master"
         },
         {
             "morph": "genivi-foundation",
             "repo": "baserock:baserock/morphs",
-            "ref": "jonathan/genivi-baseline-merge"
+            "ref": "master"
         }
     ],
     "chunks": [
diff --git a/devel-system-armv7-highbank.morph b/devel-system-armv7-highbank.morph
index 0da056f4..ab735416 100644
--- a/devel-system-armv7-highbank.morph
+++ b/devel-system-armv7-highbank.morph
@@ -9,27 +9,27 @@
         {
             "morph": "build-essential",
             "repo": "baserock:baserock/morphs",
-            "ref": "jonathan/genivi-baseline-merge"
+            "ref": "master"
         },
         {
             "morph": "core",
             "repo": "baserock:baserock/morphs",
-            "ref": "jonathan/genivi-baseline-merge"
+            "ref": "master"
         },
         {
             "morph": "foundation",
             "repo": "baserock:baserock/morphs",
-            "ref": "jonathan/genivi-baseline-merge"
+            "ref": "master"
         },
         {
             "morph": "bsp-armv7-highbank",
             "repo": "baserock:baserock/morphs",
-            "ref": "jonathan/genivi-baseline-merge"
+            "ref": "master"
         },
         {
             "morph": "tools",
             "repo": "baserock:baserock/morphs",
-            "ref": "jonathan/genivi-baseline-merge"
+            "ref": "master"
         }
     ]
 }
diff --git a/devel-system-armv7-versatile.morph b/devel-system-armv7-versatile.morph
index fc0aebb9..b10a52fe 100644
--- a/devel-system-armv7-versatile.morph
+++ b/devel-system-armv7-versatile.morph
@@ -9,27 +9,27 @@
         {
             "morph": "build-essential",
             "repo": "baserock:baserock/morphs",
-            "ref": "jonathan/genivi-baseline-merge"
+            "ref": "master"
         },
         {
             "morph": "core",
             "repo": "baserock:baserock/morphs",
-            "ref": "jonathan/genivi-baseline-merge"
+            "ref": "master"
         },
         {
             "morph": "foundation",
             "repo": "baserock:baserock/morphs",
-            "ref": "jonathan/genivi-baseline-merge"
+            "ref": "master"
         },
         {
             "morph": "bsp-armv7-versatile",
             "repo": "baserock:baserock/morphs",
-            "ref": "jonathan/genivi-baseline-merge"
+            "ref": "master"
         },
         {
             "morph": "tools",
             "repo": "baserock:baserock/morphs",
-            "ref": "jonathan/genivi-baseline-merge"
+            "ref": "master"
         }
     ]
 }
diff --git a/devel-system-x86_32-generic.morph b/devel-system-x86_32-generic.morph
index 2255b8ee..c0f4b877 100644
--- a/devel-system-x86_32-generic.morph
+++ b/devel-system-x86_32-generic.morph
@@ -9,27 +9,27 @@
         {
             "morph": "build-essential",
             "repo": "baserock:baserock/morphs",
-            "ref": "jonathan/genivi-baseline-merge"
+            "ref": "master"
         },
         {
             "morph": "core",
             "repo": "baserock:baserock/morphs",
-            "ref": "jonathan/genivi-baseline-merge"
+            "ref": "master"
         },
         {
             "morph": "foundation",
             "repo": "baserock:baserock/morphs",
-            "ref": "jonathan/genivi-baseline-merge"
+            "ref": "master"
         },
         {
             "morph": "bsp-x86_32-generic",
             "repo": "baserock:baserock/morphs",
-            "ref": "jonathan/genivi-baseline-merge"
+            "ref": "master"
         },
         {
             "morph": "tools",
             "repo": "baserock:baserock/morphs",
-            "ref": "jonathan/genivi-baseline-merge"
+            "ref": "master"
         }
     ]
 }
diff --git a/devel-system-x86_64-generic.morph b/devel-system-x86_64-generic.morph
index 875ec342..48729610 100644
--- a/devel-system-x86_64-generic.morph
+++ b/devel-system-x86_64-generic.morph
@@ -9,27 +9,27 @@
         {
             "morph": "build-essential",
             "repo": "baserock:baserock/morphs",
-            "ref": "jonathan/genivi-baseline-merge"
+            "ref": "master"
         },
         {
             "morph": "core",
             "repo": "baserock:baserock/morphs",
-            "ref": "jonathan/genivi-baseline-merge"
+            "ref": "master"
         },
         {
             "morph": "foundation",
             "repo": "baserock:baserock/morphs",
-            "ref": "jonathan/genivi-baseline-merge"
+            "ref": "master"
         },
         {
             "morph": "bsp-x86_64-generic",
             "repo": "baserock:baserock/morphs",
-            "ref": "jonathan/genivi-baseline-merge"
+            "ref": "master"
         },
         {
             "morph": "tools",
             "repo": "baserock:baserock/morphs",
-            "ref": "jonathan/genivi-baseline-merge"
+            "ref": "master"
         }
     ]
 }
diff --git a/genivi-baseline-system-armv7-versatile.morph b/genivi-baseline-system-armv7-versatile.morph
index 98b2ab37..84fb9b11 100644
--- a/genivi-baseline-system-armv7-versatile.morph
+++ b/genivi-baseline-system-armv7-versatile.morph
@@ -9,62 +9,62 @@
         {
             "morph": "build-essential",
             "repo": "baserock:baserock/morphs",
-            "ref": "jonathan/genivi-baseline-merge"
+            "ref": "master"
         },
         {
             "morph": "core",
             "repo": "baserock:baserock/morphs",
-            "ref": "jonathan/genivi-baseline-merge"
+            "ref": "master"
         },
         {
             "morph": "foundation",
             "repo": "baserock:baserock/morphs",
-            "ref": "jonathan/genivi-baseline-merge"
+            "ref": "master"
         },
         {
             "morph": "genivi-foundation",
             "repo": "baserock:baserock/morphs",
-            "ref": "jonathan/genivi-baseline-merge"
+            "ref": "master"
         },
         {
             "morph": "bsp-armv7-versatile",
             "repo": "baserock:baserock/morphs",
-            "ref": "jonathan/genivi-baseline-merge"
+            "ref": "master"
         },
         {
             "morph": "connectivity",
             "repo": "baserock:baserock/morphs",
-            "ref": "jonathan/genivi-baseline-merge"
+            "ref": "master"
         },
         {
             "morph": "audio-bluetooth",
             "repo": "baserock:baserock/morphs",
-            "ref": "jonathan/genivi-baseline-merge"
+            "ref": "master"
         },
         {
             "morph": "x-common",
             "repo": "baserock:baserock/morphs",
-            "ref": "jonathan/genivi-baseline-merge"
+            "ref": "master"
         },
         {
             "morph": "x-armv7-versatile",
             "repo": "baserock:baserock/morphs",
-            "ref": "jonathan/genivi-baseline-merge"
+            "ref": "master"
         },
         {
             "morph": "multimedia",
             "repo": "baserock:baserock/morphs",
-            "ref": "jonathan/genivi-baseline-merge"
+            "ref": "master"
         },
         {
             "morph": "genivi",
             "repo": "baserock:baserock/morphs",
-            "ref": "jonathan/genivi-baseline-merge"
+            "ref": "master"
         },
         {
             "morph": "genivi-x-armv7-versatile",
             "repo": "baserock:baserock/morphs",
-            "ref": "jonathan/genivi-baseline-merge"
+            "ref": "master"
         }
     ]
 }
diff --git a/genivi-baseline-system-x86_64-generic.morph b/genivi-baseline-system-x86_64-generic.morph
index 382697ba..756ba90a 100644
--- a/genivi-baseline-system-x86_64-generic.morph
+++ b/genivi-baseline-system-x86_64-generic.morph
@@ -9,62 +9,62 @@
         {
             "morph": "build-essential",
             "repo": "baserock:baserock/morphs",
-            "ref": "jonathan/genivi-baseline-merge"
+            "ref": "master"
         },
         {
             "morph": "core",
             "repo": "baserock:baserock/morphs",
-            "ref": "jonathan/genivi-baseline-merge"
+            "ref": "master"
         },
         {
             "morph": "foundation",
             "repo": "baserock:baserock/morphs",
-            "ref": "jonathan/genivi-baseline-merge"
+            "ref": "master"
         },
         {
             "morph": "genivi-foundation",
             "repo": "baserock:baserock/morphs",
-            "ref": "jonathan/genivi-baseline-merge"
+            "ref": "master"
         },
         {
             "morph": "bsp-x86_64-generic",
             "repo": "baserock:baserock/morphs",
-            "ref": "jonathan/genivi-baseline-merge"
+            "ref": "master"
         },
         {
             "morph": "connectivity",
             "repo": "baserock:baserock/morphs",
-            "ref": "jonathan/genivi-baseline-merge"
+            "ref": "master"
         },
         {
             "morph": "audio-bluetooth",
             "repo": "baserock:baserock/morphs",
-            "ref": "jonathan/genivi-baseline-merge"
+            "ref": "master"
         },
         {
             "morph": "x-common",
             "repo": "baserock:baserock/morphs",
-            "ref": "jonathan/genivi-baseline-merge"
+            "ref": "master"
         },
         {
             "morph": "x-x86_64-generic",
             "repo": "baserock:baserock/morphs",
-            "ref": "jonathan/genivi-baseline-merge"
+            "ref": "master"
         },
         {
             "morph": "multimedia",
             "repo": "baserock:baserock/morphs",
-            "ref": "jonathan/genivi-baseline-merge"
+            "ref": "master"
         },
         {
             "morph": "genivi",
             "repo": "baserock:baserock/morphs",
-            "ref": "jonathan/genivi-baseline-merge"
+            "ref": "master"
         },
         {
             "morph": "genivi-x-x86_64-generic",
             "repo": "baserock:baserock/morphs",
-            "ref": "jonathan/genivi-baseline-merge"
+            "ref": "master"
         }
     ]
 }
diff --git a/genivi-foundation.morph b/genivi-foundation.morph
index c54ab1dd..872eba95 100644
--- a/genivi-foundation.morph
+++ b/genivi-foundation.morph
@@ -6,12 +6,12 @@
         {
             "morph": "core",
             "repo": "baserock:baserock/morphs",
-            "ref": "jonathan/genivi-baseline-merge"
+            "ref": "master"
         },
         {
             "morph": "foundation",
             "repo": "baserock:baserock/morphs",
-            "ref": "jonathan/genivi-baseline-merge"
+            "ref": "master"
         }
     ],
     "chunks": [
diff --git a/genivi-wayland-armv7-versatile.morph b/genivi-wayland-armv7-versatile.morph
index 05d9a684..9ee91d10 100644
--- a/genivi-wayland-armv7-versatile.morph
+++ b/genivi-wayland-armv7-versatile.morph
@@ -6,27 +6,27 @@
         {
             "morph": "core",
             "repo": "baserock:baserock/morphs",
-            "ref": "jonathan/genivi-baseline-merge"
+            "ref": "master"
         },
         {
             "morph": "foundation",
             "repo": "baserock:baserock/morphs",
-            "ref": "jonathan/genivi-baseline-merge"
+            "ref": "master"
         },
         {
             "morph": "genivi-foundation",
             "repo": "baserock:baserock/morphs",
-            "ref": "jonathan/genivi-baseline-merge"
+            "ref": "master"
         },
         {
             "morph": "genivi",
             "repo": "baserock:baserock/morphs",
-            "ref": "jonathan/genivi-baseline-merge"
+            "ref": "master"
         },
         {
             "morph": "wayland-armv7-versatile",
             "repo": "baserock:baserock/morphs",
-            "ref": "jonathan/genivi-baseline-merge"
+            "ref": "master"
         }
     ],
     "chunks": [
diff --git a/genivi-wayland-x86_64-generic.morph b/genivi-wayland-x86_64-generic.morph
index 3b01d36e..33039aa4 100644
--- a/genivi-wayland-x86_64-generic.morph
+++ b/genivi-wayland-x86_64-generic.morph
@@ -6,27 +6,27 @@
         {
             "morph": "core",
             "repo": "baserock:baserock/morphs",
-            "ref": "jonathan/genivi-baseline-merge"
+            "ref": "master"
         },
         {
             "morph": "foundation",
             "repo": "baserock:baserock/morphs",
-            "ref": "jonathan/genivi-baseline-merge"
+            "ref": "master"
         },
         {
             "morph": "genivi-foundation",
             "repo": "baserock:baserock/morphs",
-            "ref": "jonathan/genivi-baseline-merge"
+            "ref": "master"
         },
         {
             "morph": "genivi",
             "repo": "baserock:baserock/morphs",
-            "ref": "jonathan/genivi-baseline-merge"
+            "ref": "master"
         },
         {
             "morph": "wayland-x86_64-generic",
             "repo": "baserock:baserock/morphs",
-            "ref": "jonathan/genivi-baseline-merge"
+            "ref": "master"
         }
     ],
     "chunks": [
diff --git a/genivi-x-armv7-versatile.morph b/genivi-x-armv7-versatile.morph
index 143daf54..edfbe14d 100644
--- a/genivi-x-armv7-versatile.morph
+++ b/genivi-x-armv7-versatile.morph
@@ -6,27 +6,27 @@
         {
             "morph": "core",
             "repo": "baserock:baserock/morphs",
-            "ref": "jonathan/genivi-baseline-merge"
+            "ref": "master"
         },
         {
             "morph": "foundation",
             "repo": "baserock:baserock/morphs",
-            "ref": "jonathan/genivi-baseline-merge"
+            "ref": "master"
         },
         {
             "morph": "genivi-foundation",
             "repo": "baserock:baserock/morphs",
-            "ref": "jonathan/genivi-baseline-merge"
+            "ref": "master"
         },
         {
             "morph": "genivi",
             "repo": "baserock:baserock/morphs",
-            "ref": "jonathan/genivi-baseline-merge"
+            "ref": "master"
         },
         {
             "morph": "x-armv7-versatile",
             "repo": "baserock:baserock/morphs",
-            "ref": "jonathan/genivi-baseline-merge"
+            "ref": "master"
         }
     ],
     "chunks": [
diff --git a/genivi-x-x86_64-generic.morph b/genivi-x-x86_64-generic.morph
index bf7f39e6..dd4e4ded 100644
--- a/genivi-x-x86_64-generic.morph
+++ b/genivi-x-x86_64-generic.morph
@@ -6,27 +6,27 @@
         {
             "morph": "core",
             "repo": "baserock:baserock/morphs",
-            "ref": "jonathan/genivi-baseline-merge"
+            "ref": "master"
         },
         {
             "morph": "foundation",
             "repo": "baserock:baserock/morphs",
-            "ref": "jonathan/genivi-baseline-merge"
+            "ref": "master"
         },
         {
             "morph": "genivi-foundation",
             "repo": "baserock:baserock/morphs",
-            "ref": "jonathan/genivi-baseline-merge"
+            "ref": "master"
         },
         {
             "morph": "genivi",
             "repo": "baserock:baserock/morphs",
-            "ref": "jonathan/genivi-baseline-merge"
+            "ref": "master"
         },
         {
             "morph": "x-x86_64-generic",
             "repo": "baserock:baserock/morphs",
-            "ref": "jonathan/genivi-baseline-merge"
+            "ref": "master"
         }
     ],
     "chunks": [
diff --git a/genivi.morph b/genivi.morph
index f1e981c7..148605e4 100644
--- a/genivi.morph
+++ b/genivi.morph
@@ -6,17 +6,17 @@
         {
             "morph": "core",
             "repo": "baserock:baserock/morphs",
-            "ref": "jonathan/genivi-baseline-merge"
+            "ref": "master"
         },
         {
             "morph": "foundation",
             "repo": "baserock:baserock/morphs",
-            "ref": "jonathan/genivi-baseline-merge"
+            "ref": "master"
         },
         {
             "morph": "genivi-foundation",
             "repo": "baserock:baserock/morphs",
-            "ref": "jonathan/genivi-baseline-merge"
+            "ref": "master"
         }
     ],
     "chunks": [
diff --git a/multimedia.morph b/multimedia.morph
index 77b0a4e4..e1adc068 100644
--- a/multimedia.morph
+++ b/multimedia.morph
@@ -6,17 +6,17 @@
         {
             "morph": "core",
             "repo": "baserock:baserock/morphs",
-            "ref": "jonathan/genivi-baseline-merge"
+            "ref": "master"
         },
         {
             "morph": "foundation",
             "repo": "baserock:baserock/morphs",
-            "ref": "jonathan/genivi-baseline-merge"
+            "ref": "master"
         },
         {
             "morph": "genivi-foundation",
             "repo": "baserock:baserock/morphs",
-            "ref": "jonathan/genivi-baseline-merge"
+            "ref": "master"
         }
     ],
     "chunks": [
diff --git a/wayland-armv7-versatile.morph b/wayland-armv7-versatile.morph
index f96d33d5..304a7ad1 100644
--- a/wayland-armv7-versatile.morph
+++ b/wayland-armv7-versatile.morph
@@ -5,22 +5,22 @@
         {
             "morph": "core",
             "repo": "baserock:baserock/morphs",
-            "ref": "jonathan/genivi-baseline-merge"
+            "ref": "master"
         },
         {
             "morph": "foundation",
             "repo": "baserock:baserock/morphs",
-            "ref": "jonathan/genivi-baseline-merge"
+            "ref": "master"
         },
         {
             "morph": "genivi-foundation",
             "repo": "baserock:baserock/morphs",
-            "ref": "jonathan/genivi-baseline-merge"
+            "ref": "master"
         },
         {
             "morph": "x-common",
             "repo": "baserock:baserock/morphs",
-            "ref": "jonathan/genivi-baseline-merge"
+            "ref": "master"
         }
     ],
     "chunks": [
diff --git a/wayland-x86_64-generic.morph b/wayland-x86_64-generic.morph
index c7f58340..95b3379d 100644
--- a/wayland-x86_64-generic.morph
+++ b/wayland-x86_64-generic.morph
@@ -5,22 +5,22 @@
         {
             "morph": "core",
             "repo": "baserock:baserock/morphs",
-            "ref": "jonathan/genivi-baseline-merge"
+            "ref": "master"
         },
         {
             "morph": "foundation",
             "repo": "baserock:baserock/morphs",
-            "ref": "jonathan/genivi-baseline-merge"
+            "ref": "master"
         },
         {
             "morph": "genivi-foundation",
             "repo": "baserock:baserock/morphs",
-            "ref": "jonathan/genivi-baseline-merge"
+            "ref": "master"
         },
         {
             "morph": "x-common",
             "repo": "baserock:baserock/morphs",
-            "ref": "jonathan/genivi-baseline-merge"
+            "ref": "master"
         }
     ],
     "chunks": [
diff --git a/x-armv7-versatile.morph b/x-armv7-versatile.morph
index ea05d117..7d023448 100644
--- a/x-armv7-versatile.morph
+++ b/x-armv7-versatile.morph
@@ -5,22 +5,22 @@
         {
             "morph": "core",
             "repo": "baserock:baserock/morphs",
-            "ref": "jonathan/genivi-baseline-merge"
+            "ref": "master"
         },
         {
             "morph": "foundation",
             "repo": "baserock:baserock/morphs",
-            "ref": "jonathan/genivi-baseline-merge"
+            "ref": "master"
         },
         {
             "morph": "genivi-foundation",
             "repo": "baserock:baserock/morphs",
-            "ref": "jonathan/genivi-baseline-merge"
+            "ref": "master"
         },
         {
             "morph": "x-common",
             "repo": "baserock:baserock/morphs",
-            "ref": "jonathan/genivi-baseline-merge"
+            "ref": "master"
         }
     ],
     "chunks": [
diff --git a/x-common.morph b/x-common.morph
index a42df4d9..c5c27498 100644
--- a/x-common.morph
+++ b/x-common.morph
@@ -5,17 +5,17 @@
         {
             "morph": "core",
             "repo": "baserock:baserock/morphs",
-            "ref": "jonathan/genivi-baseline-merge"
+            "ref": "master"
         },
         {
             "morph": "foundation",
             "repo": "baserock:baserock/morphs",
-            "ref": "jonathan/genivi-baseline-merge"
+            "ref": "master"
         },
         {
             "morph": "genivi-foundation",
             "repo": "baserock:baserock/morphs",
-            "ref": "jonathan/genivi-baseline-merge"
+            "ref": "master"
         }
     ],
     "chunks": [
diff --git a/x-x86_64-generic.morph b/x-x86_64-generic.morph
index 5b193f03..302917f0 100644
--- a/x-x86_64-generic.morph
+++ b/x-x86_64-generic.morph
@@ -5,22 +5,22 @@
         {
             "morph": "core",
             "repo": "baserock:baserock/morphs",
-            "ref": "jonathan/genivi-baseline-merge"
+            "ref": "master"
         },
         {
             "morph": "foundation",
             "repo": "baserock:baserock/morphs",
-            "ref": "jonathan/genivi-baseline-merge"
+            "ref": "master"
         },
         {
             "morph": "genivi-foundation",
             "repo": "baserock:baserock/morphs",
-            "ref": "jonathan/genivi-baseline-merge"
+            "ref": "master"
         },
         {
             "morph": "x-common",
             "repo": "baserock:baserock/morphs",
-            "ref": "jonathan/genivi-baseline-merge"
+            "ref": "master"
         }
     ],
     "chunks": [