diff --git a/Gems/Atom/RHI/Vulkan/3rdParty/Platform/Linux/glad_vulkan_linux.cmake b/Gems/Atom/RHI/Vulkan/3rdParty/Platform/Linux/glad_vulkan_linux.cmake
new file mode 100644
index 0000000000..82985b3188
--- /dev/null
+++ b/Gems/Atom/RHI/Vulkan/3rdParty/Platform/Linux/glad_vulkan_linux.cmake
@@ -0,0 +1,14 @@
+#
+# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+# its licensors.
+#
+# For complete copyright and license terms please see the LICENSE at the root of this
+# distribution (the "License"). All use of this software is governed by the License,
+# or, if provided, by the license below or the license accompanying this file. Do not
+# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#
+
+set(GLAD_VULKAN_COMPILE_DEFINITIONS 
+    VK_USE_PLATFORM_XCB_KHR
+)
diff --git a/Gems/Atom/RHI/Vulkan/Code/Include/Platform/Linux/Atom/RHI.Loader/Glad/Vulkan_Platform.h b/Gems/Atom/RHI/Vulkan/Code/Include/Platform/Linux/Atom/RHI.Loader/Glad/Vulkan_Platform.h
index 7d9a58a823..a987061daf 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Include/Platform/Linux/Atom/RHI.Loader/Glad/Vulkan_Platform.h
+++ b/Gems/Atom/RHI/Vulkan/Code/Include/Platform/Linux/Atom/RHI.Loader/Glad/Vulkan_Platform.h
@@ -10,3 +10,6 @@
 *
 */
 #pragma once
+
+#include <xcb/xcb.h>
+#include <xcb/xcbext.h>
diff --git a/Gems/Atom/RHI/Vulkan/Code/Include/Platform/Linux/Atom_RHI_Vulkan_precompiled_Linux.h b/Gems/Atom/RHI/Vulkan/Code/Include/Platform/Linux/Atom_RHI_Vulkan_precompiled_Linux.h
new file mode 100644
index 0000000000..d41a8bb0c7
--- /dev/null
+++ b/Gems/Atom/RHI/Vulkan/Code/Include/Platform/Linux/Atom_RHI_Vulkan_precompiled_Linux.h
@@ -0,0 +1,21 @@
+/*
+* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+* its licensors.
+*
+* For complete copyright and license terms please see the LICENSE at the root of this
+* distribution (the "License"). All use of this software is governed by the License,
+* or, if provided, by the license below or the license accompanying this file. Do not
+* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*
+*/
+#pragma once
+
+#include <AzCore/base.h>
+#include <AzCore/PlatformIncl.h>
+#include <AzCore/std/algorithm.h>
+#include <vulkan/vulkan.h>
+#include <limits.h>
+#include <RHI/Vulkan.h>
+
+#define AZ_VULKAN_SURFACE_EXTENSION_NAME VK_KHR_XCB_SURFACE_EXTENSION_NAME
diff --git a/Gems/Atom/RHI/Vulkan/Code/Include/Platform/Linux/Atom_RHI_Vulkan_precompiled_Platform.h b/Gems/Atom/RHI/Vulkan/Code/Include/Platform/Linux/Atom_RHI_Vulkan_precompiled_Platform.h
index f42f05ee79..16ff9fdd88 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Include/Platform/Linux/Atom_RHI_Vulkan_precompiled_Platform.h
+++ b/Gems/Atom/RHI/Vulkan/Code/Include/Platform/Linux/Atom_RHI_Vulkan_precompiled_Platform.h
@@ -11,4 +11,5 @@
 */
 #pragma once
 
+#include <Atom_RHI_Vulkan_precompiled_Linux.h>
 
diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Linux/PAL_linux.cmake b/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Linux/PAL_linux.cmake
index 57bf0561d9..d6b3f6c001 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Linux/PAL_linux.cmake
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Linux/PAL_linux.cmake
@@ -9,4 +9,4 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 #
 
-set(PAL_TRAIT_ATOM_RHI_VULKAN_SUPPORTED FALSE)
\ No newline at end of file
+set(PAL_TRAIT_ATOM_RHI_VULKAN_SUPPORTED TRUE)
\ No newline at end of file
diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Linux/RHI/WSISurface_Linux.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Linux/RHI/WSISurface_Linux.cpp
new file mode 100644
index 0000000000..8e2521325e
--- /dev/null
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Linux/RHI/WSISurface_Linux.cpp
@@ -0,0 +1,36 @@
+/*
+* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+* its licensors.
+*
+* For complete copyright and license terms please see the LICENSE at the root of this
+* distribution (the "License"). All use of this software is governed by the License,
+* or, if provided, by the license below or the license accompanying this file. Do not
+* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*
+*/
+#include "Atom_RHI_Vulkan_precompiled.h"
+#include <RHI/Conversion.h>
+#include <RHI/Instance.h>
+#include <RHI/WSISurface.h>
+
+namespace AZ
+{
+    namespace Vulkan
+    {
+        RHI::ResultCode WSISurface::BuildNativeSurface()
+        {
+            Instance& instance = Instance::GetInstance();
+
+            VkXcbSurfaceCreateInfoKHR createInfo{};
+            createInfo.sType = VK_STRUCTURE_TYPE_XCB_SURFACE_CREATE_INFO_KHR;
+            createInfo.pNext = nullptr;
+            createInfo.flags = 0;
+            createInfo.window = static_cast<xcb_window_t>(m_descriptor.m_windowHandle.GetIndex());
+            const VkResult result = vkCreateXcbSurfaceKHR(instance.GetNativeInstance(), &createInfo, nullptr, &m_nativeSurface);
+            AssertSuccess(result);
+
+            return ConvertResult(result);
+        }
+    }
+}
\ No newline at end of file
diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Linux/platform_private_linux_files.cmake b/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Linux/platform_private_linux_files.cmake
index 04a399e16b..02902fd17d 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Linux/platform_private_linux_files.cmake
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Linux/platform_private_linux_files.cmake
@@ -10,7 +10,7 @@
 #
 
 set(FILES
-    ../Common/Unimplemented/ModuleStub_Unimplemented.cpp
+    RHI/WSISurface_Linux.cpp
     Vulkan_Traits_Linux.h
     Vulkan_Traits_Platform.h
 )