diff --git a/globalpayments-gateway-provider-for-woocommerce.php b/globalpayments-gateway-provider-for-woocommerce.php
index a47fb17..ad51912 100644
--- a/globalpayments-gateway-provider-for-woocommerce.php
+++ b/globalpayments-gateway-provider-for-woocommerce.php
@@ -23,3 +23,60 @@
 	include_once $autoloader;
 	add_action( 'plugins_loaded', array( \GlobalPayments\WooCommercePaymentGatewayProvider\Plugin::class, 'init' ) );
 }
+
+function globalpayments_v110_v111( WP_Upgrader $wp_upgrader, $hook_extra ) {
+	if ( 'plugin' !== $hook_extra[ 'type' ] || plugin_basename( __FILE__ ) == $hook_extra[ 'plugins' ] ) {
+		return;
+	}
+	if ( 'update' === $hook_extra[ 'action' ] || 'install' === $hook_extra[ 'action' ] ) {
+		$current_plugin_version = get_option( 'woocommerce_globalpayments_version' );
+		if ( ! empty( $current_plugin_version ) ) {
+			if ( version_compare( \GlobalPayments\WooCommercePaymentGatewayProvider\Plugin::VERSION, $current_plugin_version, '>') ) {
+				delete_option( 'woocommerce_globalpayments_version' );
+				update_option( 'woocommerce_globalpayments_version', \GlobalPayments\WooCommercePaymentGatewayProvider\Plugin::VERSION );
+			}
+			return;
+		}
+		$globalpayments_keys = [
+			'globalpayments_gpapi'     => [
+				'app_id',
+				'app_key',
+			],
+			'globalpayments_heartland' => [
+				'public_key',
+				'secret_key',
+			],
+			'globalpayments_genius'    => [
+				'merchant_name',
+				'merchant_site_id',
+				'merchant_key',
+				'web_api_key',
+			],
+			'globalpayments_transit'   => [
+				'merchant_id',
+				'user_id',
+				'password',
+				'device_id',
+				'tsep_device_id',
+				'transaction_key',
+			],
+		];
+		foreach ( $globalpayments_keys as $gateway_id => $gateway_keys ) {
+			$settings = get_option( 'woocommerce_' . $gateway_id . '_settings' );
+			// General rule: if the gateway is not set to "Live Mode", move the credentials in sandbox keys.
+			if ( ( 'globalpayments_heartland' === $gateway_id && isset( $settings['public_key'] ) && false === strpos( $settings['public_key'], 'pkapi_prod_' ) )
+				|| 'globalpayments_heartland' !== $gateway_id && ! isset( $settings['is_production'] )
+				|| isset( $settings['is_production'] ) && ! wc_string_to_bool( $settings['is_production'] ) ) {
+				foreach ( $gateway_keys as $gateway_key ) {
+					if ( isset( $settings[$gateway_key] ) ) {
+						$settings['sandbox_' . $gateway_key] = $settings[$gateway_key];
+						$settings[$gateway_key] = '';
+					}
+				}
+				update_option( 'woocommerce_' . $gateway_id . '_settings', $settings );
+			}
+		}
+		update_option( 'woocommerce_globalpayments_version', \GlobalPayments\WooCommercePaymentGatewayProvider\Plugin::VERSION );
+	}
+}
+add_action( 'upgrader_process_complete', 'globalpayments_v110_v111', 10, 2 );
\ No newline at end of file