diff --git a/.gitignore b/.gitignore
index a63cea8f8..260d787a9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -32,4 +32,4 @@ Pods/
 # Fastlane
 fastlane/report.xml
 fastlane/Reports
-fastlane/README.md
+fastlane/README.md
\ No newline at end of file
diff --git a/Gemfile b/Gemfile
index 82d1e3049..cacbc44b6 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,4 +1,8 @@
 source "https://rubygems.org"
 
+gem "xcode-install"
 gem "fastlane"
-gem "cocoapods"
+gem "cocoapods", '~>1.5.3'
+
+plugins_path = File.join(File.dirname(__FILE__), 'fastlane', 'Pluginfile')
+eval_gemfile(plugins_path) if File.exist?(plugins_path)
diff --git a/Gemfile.lock b/Gemfile.lock
index a7582038d..621171f3d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -102,6 +102,7 @@ GEM
       xcodeproj (>= 1.6.0, < 2.0.0)
       xcpretty (~> 0.3.0)
       xcpretty-travis-formatter (>= 0.0.3)
+    fastlane-plugin-versioning (0.3.4)
     fourflusher (2.0.1)
     fuzzy_match (2.0.4)
     gh_inspector (1.1.3)
@@ -133,7 +134,7 @@ GEM
       mime-types-data (~> 3.2015)
     mime-types-data (3.2018.0812)
     mini_magick (4.5.1)
-    minitest (5.8.5)
+    minitest (5.11.3)
     molinillo (0.6.6)
     multi_json (1.13.1)
     multi_xml (0.6.0)
@@ -151,7 +152,7 @@ GEM
       uber (< 0.2.0)
     retriable (3.1.2)
     rouge (2.0.7)
-    ruby-macho (1.2.0)
+    ruby-macho (1.3.1)
     rubyzip (1.2.2)
     security (0.1.3)
     signet (0.10.0)
@@ -179,6 +180,9 @@ GEM
     unf_ext (0.0.7.5)
     unicode-display_width (1.4.0)
     word_wrap (1.0.0)
+    xcode-install (2.4.4)
+      claide (>= 0.9.1, < 1.1.0)
+      fastlane (>= 2.1.0, < 3.0.0)
     xcodeproj (1.6.0)
       CFPropertyList (>= 2.3.3, < 4.0)
       atomos (~> 0.1.3)
@@ -194,8 +198,10 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  cocoapods
+  cocoapods (~> 1.5.3)
   fastlane
+  fastlane-plugin-versioning
+  xcode-install
 
 BUNDLED WITH
-   1.16.4
+   1.16.2
diff --git a/Podfile b/Podfile
index d4fc9246a..1037cc015 100644
--- a/Podfile
+++ b/Podfile
@@ -102,16 +102,6 @@ post_install do |installer|
             config.build_settings['ENABLE_BITCODE'] = 'NO'
             config.build_settings['SWIFT_VERSION'] = '4.0'     # Required for PiwikTracker. Should be removed
         end
-
-        # Set the right identity to build pods frameworks to be able to make release builds
-        # See https://github.com/CocoaPods/CocoaPods/issues/3156#issuecomment-102022787
-        if target.to_s.include? 'Pods'
-            target.build_configurations.each do |config|
-                if !config.to_s.include? 'Debug'
-                    config.build_settings['CODE_SIGN_IDENTITY[sdk=iphoneos*]'] = 'iPhone Distribution'
-                end
-            end
-        end
     end
 end