diff --git a/.npmignore b/.npmignore
index 62609afc..8d5f96d6 100644
--- a/.npmignore
+++ b/.npmignore
@@ -56,6 +56,7 @@ android/gradlew
 android/build
 android/gradlew.bat
 android/gradle/
+docs
 .idea
 coverage
 yarn.lock
diff --git a/bin/cocoapods.sh b/bin/cocoapods.sh
index e929140d..07e9a26f 100755
--- a/bin/cocoapods.sh
+++ b/bin/cocoapods.sh
@@ -1,7 +1,5 @@
 #!/bin/sh
 
-## https://github.com/auth0/react-native-lock/blob/master/bin/cocoapods.sh
-
 ios_dir=`pwd`/ios
 if [ -d ios_dir ]
   then
@@ -9,9 +7,11 @@ if [ -d ios_dir ]
 fi
 
 podfile="$ios_dir/Podfile"
-template=`pwd`/node_modules/react-native-firebase/ios/Podfile.template
+template=`pwd`/node_modules/react-native-firebase/Podfile.template
 
-echo "Checking Podfile in iOS project ($podfile)"
+project_name=$(node -pe "require('./package.json').name")
+
+echo "Checking Podfile in iOS project $project_name ($podfile)"
 
 if [ -f $podfile ]
   then
@@ -21,22 +21,6 @@ if [ -f $podfile ]
 
   if [ "$generate_env_file" != "y" ]
     then
-
-    # pod outdated | grep "The following pod updates are available:"
-    # status=$?
-    # if [ $status -eq 0 ]; then
-    #   echo "From what I can tell, there look to be updates available..."
-    #   echo "Do you want to update your cocoapods? [N/y]"
-    #   read update_pods
-    #   if [ "$update_pods" != "y" ]
-    #     then
-    #       pod update --project-directory=ios
-    #       exit 0
-    #     else
-    #       exit 0
-    #   fi
-    # fi
-
     echo "Add the following pods":
     echo ""
     echo ""
@@ -53,10 +37,26 @@ fi
 
 echo "Adding Podfile to iOS project"
 
-cd ios
-pod init >/dev/null 2>&1
-cat $template >> $podfile
-cd ..
+touch ios/Podfile
+cat >ios/Podfile <<EOL
+target '${project_name}' do
+  # Uncomment the next line if you're using Swift or would like to use dynamic frameworks
+  # use_frameworks!
+  # Pods for '${project_name}'
+end
+
+# RNFirebase
+pod 'Firebase/Auth'
+pod 'Firebase/Analytics'
+pod 'Firebase/AppIndexing'
+pod 'Firebase/Core'
+pod 'Firebase/Crash'
+pod 'Firebase/Database'
+pod 'Firebase/DynamicLinks'
+pod 'Firebase/Messaging'
+pod 'Firebase/RemoteConfig'
+pod 'Firebase/Storage'
+EOL
 
 echo "Installing Pods"
 
diff --git a/ios/Podfile.template b/ios/Podfile.template
index 2b3ef54c..9e4bbc45 100644
--- a/ios/Podfile.template
+++ b/ios/Podfile.template
@@ -1,15 +1,10 @@
-source 'https://github.com/CocoaPods/Specs.git'
-use_frameworks!
-platform :ios, '8.0'
-
-[
-  'Firebase',
-  'Firebase/Core',
-  'Firebase/Auth',
-  'Firebase/Storage',
-  'Firebase/Database',
-  'Firebase/RemoteConfig',
-  'Firebase/Messaging'
-].each do |lib|
-  pod lib
-end
+pod 'Firebase/Auth'
+pod 'Firebase/Analytics'
+pod 'Firebase/AppIndexing'
+pod 'Firebase/Core'
+pod 'Firebase/Crash'
+pod 'Firebase/Database'
+pod 'Firebase/DynamicLinks'
+pod 'Firebase/Messaging'
+pod 'Firebase/RemoteConfig'
+pod 'Firebase/Storage'
diff --git a/ios/buildScript.sh b/ios/buildScript.sh
deleted file mode 100755
index 524391e8..00000000
--- a/ios/buildScript.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-
-frameworks="Firebase FirebaseAnalytics"
-
-source "${SRCROOT}/Pods/Target Support Files/Pods-Firestack/Pods-Firestack-frameworks.sh"
-FRAMEWORKS_FOLDER_PATH=""
-
-for framework in $frameworks
-do
-
-install_framework "${SRCROOT}/Pods/$framework"
-
-done