diff --git a/src/Components/CreateImageWizard/CreateImageWizard.js b/src/Components/CreateImageWizard/CreateImageWizard.js
index 51eef5a3..45ed8f45 100644
--- a/src/Components/CreateImageWizard/CreateImageWizard.js
+++ b/src/Components/CreateImageWizard/CreateImageWizard.js
@@ -110,7 +110,7 @@ const CreateImage = () => {
     const dispatch = useDispatch();
     const history = useHistory();
     const [ user, setUser ] = useState();
-    const [ isSaving, setIsSaving ] = useState();
+    const [ , setIsSaving ] = useState();
     useEffect(() => {
         (async () => {
             const userData = await insights.chrome.auth.getUser();
@@ -170,8 +170,8 @@ https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html/up
                     fields: [
                         imageOutput,
                         awsTarget,
-                        msAzureTarget,
                         googleCloudTarger,
+                        msAzureTarget,
                         registration(user),
                         packages,
                         review,
diff --git a/src/Components/CreateImageWizard/formComponents/RadioWithPopover.js b/src/Components/CreateImageWizard/formComponents/RadioWithPopover.js
index 612acaac..00474b7f 100644
--- a/src/Components/CreateImageWizard/formComponents/RadioWithPopover.js
+++ b/src/Components/CreateImageWizard/formComponents/RadioWithPopover.js
@@ -14,6 +14,7 @@ const RadioWithPopover = ({ Popover, ...props }) => {
 
 RadioWithPopover.propTypes = {
     Popover: PropTypes.elementType.isRequired,
+    label: PropTypes.node
 };
 
 export default RadioWithPopover;
diff --git a/src/Components/CreateImageWizard/formComponents/TargetEnvironment.js b/src/Components/CreateImageWizard/formComponents/TargetEnvironment.js
index e85893c3..089a6e26 100644
--- a/src/Components/CreateImageWizard/formComponents/TargetEnvironment.js
+++ b/src/Components/CreateImageWizard/formComponents/TargetEnvironment.js
@@ -40,6 +40,24 @@ const TargetEnvironment = ({ label, isRequired, ...props }) => {
                 isSelected={ environemt.aws }
                 isStacked
                 isDisplayLarge />
+            <Tile
+                className="tile"
+                data-testid="upload-google"
+                title="Google Cloud Platform"
+                icon={ <img
+                    className='provider-icon'
+                    src={ '/apps/frontend-assets/partners-icons/google-cloud-short.svg' } /> }
+                onClick={ () => setEnvironment((prevEnv) => {
+                    const newEnv = ({
+                        ...prevEnv,
+                        google: !prevEnv.google
+                    });
+                    change(input.name, newEnv);
+                    return newEnv;
+                }) }
+                isSelected={ environemt.google }
+                isStacked
+                isDisplayLarge />
             <Tile
                 className="tile pf-u-mr-sm"
                 data-testid="upload-azure"
@@ -59,24 +77,6 @@ const TargetEnvironment = ({ label, isRequired, ...props }) => {
                 isSelected={ environemt.azure }
                 isStacked
                 isDisplayLarge />
-            <Tile
-                className="tile"
-                data-testid="upload-google"
-                title="Google Cloud Platform"
-                icon={ <img
-                    className='provider-icon'
-                    src={ '/apps/frontend-assets/partners-icons/google-cloud-short.svg' } /> }
-                onClick={ () => setEnvironment((prevEnv) => {
-                    const newEnv = ({
-                        ...prevEnv,
-                        google: !prevEnv.google
-                    });
-                    change(input.name, newEnv);
-                    return newEnv;
-                }) }
-                isSelected={ environemt.google }
-                isStacked
-                isDisplayLarge />
         </div>
     </FormGroup>;
 };
diff --git a/src/Components/CreateImageWizard/steps/googleCloud.js b/src/Components/CreateImageWizard/steps/googleCloud.js
index 8e7936c6..68f9b7fb 100644
--- a/src/Components/CreateImageWizard/steps/googleCloud.js
+++ b/src/Components/CreateImageWizard/steps/googleCloud.js
@@ -2,6 +2,7 @@ import React from 'react';
 import componentTypes from '@data-driven-forms/react-form-renderer/component-types';
 import validatorTypes from '@data-driven-forms/react-form-renderer/validator-types';
 import { HelpIcon } from '@patternfly/react-icons';
+import nextStepMapper from './stepMapper';
 import { Title, Text, Popover, TextContent, TextList, TextListItem, Button } from '@patternfly/react-core';
 import PropTypes from 'prop-types';
 
@@ -58,7 +59,7 @@ export default {
     customTitle: <Title headingLevel="h1" size="xl">Target Environment - Google Cloud Platform</Title>,
     name: 'google-cloud-target-env',
     substepOf: 'Target environment',
-    nextStep: 'registration',
+    nextStep: ({ values }) => nextStepMapper(values, true, true),
     fields: [
         {
             component: componentTypes.PLAIN_TEXT,
diff --git a/src/Components/CreateImageWizard/steps/msAzure.js b/src/Components/CreateImageWizard/steps/msAzure.js
index 82c5849e..de8962f9 100644
--- a/src/Components/CreateImageWizard/steps/msAzure.js
+++ b/src/Components/CreateImageWizard/steps/msAzure.js
@@ -1,7 +1,6 @@
 import React from 'react';
 import componentTypes from '@data-driven-forms/react-form-renderer/component-types';
 import validatorTypes from '@data-driven-forms/react-form-renderer/validator-types';
-import nextStepMapper from './stepMapper';
 import { Title, Text, Button } from '@patternfly/react-core';
 import { ExternalLinkAltIcon } from '@patternfly/react-icons';
 
@@ -10,7 +9,7 @@ export default {
     customTitle: <Title headingLevel="h1" size="xl">Target Environment - Microsoft Azure</Title>,
     name: 'ms-azure-target-env',
     substepOf: 'Target environment',
-    nextStep: ({ values }) => nextStepMapper(values, true, true),
+    nextStep: 'registration',
     fields: [
         {
             component: componentTypes.PLAIN_TEXT,
diff --git a/src/Components/CreateImageWizard/steps/stepMapper.js b/src/Components/CreateImageWizard/steps/stepMapper.js
index 64437d52..3ac4b921 100644
--- a/src/Components/CreateImageWizard/steps/stepMapper.js
+++ b/src/Components/CreateImageWizard/steps/stepMapper.js
@@ -3,12 +3,12 @@ export default ({ 'target-environment': targetEnv } = {}, skipFirst, skipSecond)
         return 'aws-target-env';
     }
 
-    if (!skipSecond && targetEnv?.azure) {
-        return 'ms-azure-target-env';
+    if (!skipSecond && targetEnv?.google) {
+        return 'google-cloud-target-env';
     }
 
-    if (targetEnv?.google) {
-        return 'google-cloud-target-env';
+    if (targetEnv?.azure) {
+        return 'ms-azure-target-env';
     }
 
     return 'registration';