diff --git a/manifest b/manifest
index d328693..0b72b76 100644
--- a/manifest
+++ b/manifest
@@ -1,17 +1,14 @@
 package_sets:
-   - type: git
-     url: $GITORIOUS_ROOT/rock-toolchain/package_set.git
-     push_to: $GITORIOUS_PUSH_ROOT/rock-toolchain/package_set.git
-     branch: $ROCK_FLAVOR
-   - type: git
-     url: $GITORIOUS_ROOT/rock-tutorials/package_set.git
-     push_to: $GITORIOUS_PUSH_ROOT/rock-tutorials/package_set.git
+   - github: rock-core/package_set
+     branch: feature/qt5
+   - github: rock-core/rock-package_set
+     branch: feature/qt5
+   - github: rock-tutorials/tutorials-package_set
 
 # Layout. Note that the rock.base, rock.toolchain and orocos.toolchain sets are
 # imported by other rock sets.
 layout:
-   - rock.base
-   - rock.toolchain
+   - rock.core
    - rock.tutorials
 
 exclude_packages:
diff --git a/overrides.yml b/overrides.yml
index 4c56dd5..4f47a33 100644
--- a/overrides.yml
+++ b/overrides.yml
@@ -2,7 +2,35 @@
 # in the package sets. Below is an example to change the branch name for a given
 # package
 #
-# overrides:
-#   - rtt
-#     branch: test
-# 
+
+overrides:
+  # For compatibility with qt5
+  - gui/vizkit3d:
+    github: rock-core/gui-vizkit3d.git
+    branch: feature/qt5
+
+  - gui/rock_widget_collection:
+    github: rock-core/gui-rock_widget_collection.git
+    branch: feature/qt5
+
+  - gui/osg_qt4:
+    github: rock-core/gui-osg_qt4.git
+    branch: feature/qt5
+
+  - base/types:
+    github: rock-core/base-types.git
+    branch: feature/qt5
+
+  # Pending merge requests
+  - tutorials/designer_widget_tutorial:
+    github: haider8645/tutorials-designer_widget_tutorial
+    branch: qt5   
+  
+  - tutorials/vizkit3d_plugin_tutorial:
+    github: haider8645/tutorials-vizkit3d_plugin_tutorial
+    branch: feature/qt5       
+
+  - tutorials/rock_tutorial :
+    github: haider8645/tutorials-rock_tutorial
+    branch: feature/qt5       
+