diff --git a/OSGKeyboardExtTests/Info.plist b/OSGKeyboardExtTests/Info.plist
index 2d98bea..26b175d 100644
--- a/OSGKeyboardExtTests/Info.plist
+++ b/OSGKeyboardExtTests/Info.plist
@@ -15,8 +15,8 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
+	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleVersion</key>
-	<string>1</string>
+	<string>$(CURRENT_PROJECT_VERSION)</string>
 </dict>
-</plist>
\ No newline at end of file
+</plist>
diff --git a/OSGKeyboardHostSupport/Info.plist b/OSGKeyboardHostSupport/Info.plist
index 323e5ec..82790df 100644
--- a/OSGKeyboardHostSupport/Info.plist
+++ b/OSGKeyboardHostSupport/Info.plist
@@ -15,8 +15,8 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
+	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleVersion</key>
-	<string>1</string>
+	<string>$(CURRENT_PROJECT_VERSION)</string>
 </dict>
 </plist>
diff --git a/OSGKeyboardMacTests/Info.plist b/OSGKeyboardMacTests/Info.plist
index 6c40a6c..26b175d 100644
--- a/OSGKeyboardMacTests/Info.plist
+++ b/OSGKeyboardMacTests/Info.plist
@@ -15,8 +15,8 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
+	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleVersion</key>
-	<string>1</string>
+	<string>$(CURRENT_PROJECT_VERSION)</string>
 </dict>
 </plist>
diff --git a/OSGKeyboardShared/Info.plist b/OSGKeyboardShared/Info.plist
index 323e5ec..82790df 100644
--- a/OSGKeyboardShared/Info.plist
+++ b/OSGKeyboardShared/Info.plist
@@ -15,8 +15,8 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
+	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleVersion</key>
-	<string>1</string>
+	<string>$(CURRENT_PROJECT_VERSION)</string>
 </dict>
 </plist>
diff --git a/OSGKeyboardTests/Info.plist b/OSGKeyboardTests/Info.plist
index 6c40a6c..26b175d 100644
--- a/OSGKeyboardTests/Info.plist
+++ b/OSGKeyboardTests/Info.plist
@@ -15,8 +15,8 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
+	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleVersion</key>
-	<string>1</string>
+	<string>$(CURRENT_PROJECT_VERSION)</string>
 </dict>
 </plist>
diff --git a/OSGKeyboardUITests/Info.plist b/OSGKeyboardUITests/Info.plist
index 6c40a6c..26b175d 100644
--- a/OSGKeyboardUITests/Info.plist
+++ b/OSGKeyboardUITests/Info.plist
@@ -15,8 +15,8 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
+	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleVersion</key>
-	<string>1</string>
+	<string>$(CURRENT_PROJECT_VERSION)</string>
 </dict>
 </plist>
diff --git a/project.yml b/project.yml
index 9a6b7e2..7f4dbde 100644
--- a/project.yml
+++ b/project.yml
@@ -399,6 +399,9 @@ targets:
           - "include/**"
     info:
       path: OSGKeyboardShared/Info.plist
+      properties:
+        CFBundleShortVersionString: "$(MARKETING_VERSION)"
+        CFBundleVersion: "$(CURRENT_PROJECT_VERSION)"
     settings:
       base:
         PRODUCT_BUNDLE_IDENTIFIER: com.osgkeyboard.ios.shared
@@ -433,6 +436,9 @@ targets:
       - path: OSGKeyboardHostSupport
     info:
       path: OSGKeyboardHostSupport/Info.plist
+      properties:
+        CFBundleShortVersionString: "$(MARKETING_VERSION)"
+        CFBundleVersion: "$(CURRENT_PROJECT_VERSION)"
     settings:
       base:
         PRODUCT_BUNDLE_IDENTIFIER: com.osgkeyboard.ios.hostsupport
@@ -465,6 +471,9 @@ targets:
       - path: Tests/ProviderToolRequestCoordinatorTests.swift
     info:
       path: OSGKeyboardTests/Info.plist
+      properties:
+        CFBundleShortVersionString: "$(MARKETING_VERSION)"
+        CFBundleVersion: "$(CURRENT_PROJECT_VERSION)"
     dependencies:
       - target: OSGKeyboard
       - target: OSGKeyboardHostSupport
@@ -488,6 +497,9 @@ targets:
         buildPhase: resources
     info:
       path: OSGKeyboardExtTests/Info.plist
+      properties:
+        CFBundleShortVersionString: "$(MARKETING_VERSION)"
+        CFBundleVersion: "$(CURRENT_PROJECT_VERSION)"
     dependencies:
       - target: OSGKeyboardShared
     settings:
@@ -507,6 +519,9 @@ targets:
       - path: OSGKeyboardUITests
     info:
       path: OSGKeyboardUITests/Info.plist
+      properties:
+        CFBundleShortVersionString: "$(MARKETING_VERSION)"
+        CFBundleVersion: "$(CURRENT_PROJECT_VERSION)"
     dependencies:
       - target: OSGKeyboard
     settings:
@@ -531,6 +546,9 @@ targets:
       - path: Tests/ProviderToolRequestCoordinatorTests.swift
     info:
       path: OSGKeyboardMacTests/Info.plist
+      properties:
+        CFBundleShortVersionString: "$(MARKETING_VERSION)"
+        CFBundleVersion: "$(CURRENT_PROJECT_VERSION)"
     dependencies:
       - target: OSGKeyboardMac
     settings: