diff --git a/.travis/before_install.sh b/.travis/before_install.sh
index 31a8b9f7..1f5a666b 100755
--- a/.travis/before_install.sh
+++ b/.travis/before_install.sh
@@ -82,7 +82,7 @@ if [ -n "$PULP_BINDINGS_PR_NUMBER" ]; then
 fi
 
 
-git clone --depth=1 https://github.com/pulp/pulpcore.git --branch 3.0
+git clone --depth=1 https://github.com/pulp/pulpcore.git --branch master
 
 if [ -n "$PULP_PR_NUMBER" ]; then
   cd pulpcore
diff --git a/.travis/cherrypick.py b/.travis/cherrypick.py
index f3da465a..048ab3bd 100644
--- a/.travis/cherrypick.py
+++ b/.travis/cherrypick.py
@@ -67,7 +67,7 @@ def get_merged_commits(pr):
 g = Github(GITHUB_TOKEN)
 grepo = g.get_repo(REPOSITORY)
 (label,) = (l for l in grepo.get_labels() if l.name == PR_LABEL)
-issues = grepo.get_issues(labels=[label], state="all")
+issues = grepo.get_issues(labels=[label], state="all", sort="updated", direction="asc")
 
 cherrypicks = []
 
diff --git a/.travis/install.sh b/.travis/install.sh
index b5c56fda..76997d77 100755
--- a/.travis/install.sh
+++ b/.travis/install.sh
@@ -49,13 +49,19 @@ fi
 if [ -e $TRAVIS_BUILD_DIR/../pulp_file ]; then
   PULP_FILE=./pulp_file
 else
-  PULP_FILE=git+https://github.com/pulp/pulp_file.git@0.1
+  PULP_FILE=git+https://github.com/pulp/pulp_file.git@master
 fi
 
 if [ -e $TRAVIS_BUILD_DIR/../pulp_container ]; then
   PULP_CONTAINER=./pulp_container
 else
-  PULP_CONTAINER=git+https://github.com/pulp/pulp_container.git@1.0
+  PULP_CONTAINER=git+https://github.com/pulp/pulp_container.git@master
+fi
+
+if [ -e $TRAVIS_BUILD_DIR/../pulp_rpm ]; then
+  PULP_RPM=./pulp_rpm
+else
+  PULP_RPM=git+https://github.com/pulp/pulp_rpm.git@master
 fi
 
 if [ -n "$TRAVIS_TAG" ]; then
@@ -66,11 +72,12 @@ images:
   - pulp-2to3-migration-${TAG}:
       image_name: pulp-2to3-migration
       tag: $TAG
-      pulpcore: pulpcore~=3.0.0
+      pulpcore: pulpcore
       plugins:
         - ./pulp-2to3-migration
-        - pulp_file~=0.1.0
-        - pulp_container~=1.0.0
+        - pulp_file
+        - pulp_container
+        - pulp_rpm
 VARSYAML
 else
   cat > vars/vars.yaml << VARSYAML
@@ -84,6 +91,7 @@ images:
         - ./pulp-2to3-migration
         - $PULP_FILE
         - $PULP_CONTAINER
+        - $PULP_RPM
 VARSYAML
 fi
 ansible-playbook -v build.yaml
diff --git a/pulp_2to3_migration/__init__.py b/pulp_2to3_migration/__init__.py
index d6ad5c2c..9a6028e7 100644
--- a/pulp_2to3_migration/__init__.py
+++ b/pulp_2to3_migration/__init__.py
@@ -1,3 +1,3 @@
-__version__ = "0.1.0rc1"
+__version__ = "0.2.0b1.dev"
 
 default_app_config = 'pulp_2to3_migration.app.Pulp2To3MigrationPluginAppConfig'
diff --git a/setup.py b/setup.py
index fd37bc0d..0bd4eb30 100644
--- a/setup.py
+++ b/setup.py
@@ -3,7 +3,7 @@
 from setuptools import find_packages, setup
 
 requirements = [
-    'pulpcore>=3.0,<3.1',
+    'pulpcore>=3.1',
     'mongoengine',
     'semantic_version',
     'jsonschema'
@@ -11,7 +11,7 @@
 
 setup(
     name='pulp-2to3-migration',
-    version='0.1.0rc1',
+    version='0.2.0b1.dev',
     description='Pulp 2 to Pulp 3 migration tool',
     license='GPLv2+',
     author='Pulp Team',
diff --git a/template_config.yml b/template_config.yml
index 2b3b5cbd..dbcffce9 100644
--- a/template_config.yml
+++ b/template_config.yml
@@ -2,8 +2,9 @@
 # were not present before running plugin-template have been added with their default values.
 
 additional_plugins:
-- { name: pulp_file, branch: 0.1, pip_version_specifier: ~=0.1.0 }
-- { name: pulp_container, branch: 1.0, pip_version_specifier: ~=1.0.0 }
+- { name: pulp_file, branch: master }
+- { name: pulp_container, branch: master }
+- { name: pulp_rpm, branch: master }
 black: false
 check_commit_message: true
 cherry_pick_automation: false
@@ -25,8 +26,8 @@ plugin_dash_short: 2to3-migration
 plugin_name: pulp-2to3-migration
 plugin_snake: pulp_2to3_migration
 pulp_settings: null
-pulpcore_branch: 3.0
-pulpcore_pip_version_specifier: ~=3.0.0
+pulpcore_branch: master
+pulpcore_pip_version_specifier: null
 pydocstyle: false
 pypi_username: pulp
 stable_branch: null