diff --git a/sycl/include/CL/sycl/accessor.hpp b/sycl/include/CL/sycl/accessor.hpp
index 454e13a00decd..afdcfa1d6d60e 100644
--- a/sycl/include/CL/sycl/accessor.hpp
+++ b/sycl/include/CL/sycl/accessor.hpp
@@ -336,11 +336,11 @@ class accessor :
   using reference = DataT &;
   using const_reference = const DataT &;
 
-  template <int Dims = Dimensions>
+  template <typename AllocatorT, int Dims = Dimensions>
   accessor(
       enable_if_t<Dims == 0 && ((!IsPlaceH && IsHostBuf) ||
                                 (IsPlaceH && (IsGlobalBuf || IsConstantBuf))),
-                  buffer<DataT, 1>> &BufferRef)
+                  buffer<DataT, 1, AllocatorT>> &BufferRef)
 #ifdef __SYCL_DEVICE_ONLY__
       : impl(id<AdjustedDim>(), BufferRef.get_range(), BufferRef.MemRange) {
 #else
@@ -357,9 +357,9 @@ class accessor :
 #endif
   }
 
-  template <int Dims = Dimensions>
+  template <typename AllocatorT, int Dims = Dimensions>
   accessor(
-      buffer<DataT, 1> &BufferRef,
+      buffer<DataT, 1, AllocatorT> &BufferRef,
       enable_if_t<Dims == 0 && (!IsPlaceH && (IsGlobalBuf || IsConstantBuf)),
                   handler> &CommandGroupHandler)
 #ifdef __SYCL_DEVICE_ONLY__
@@ -376,11 +376,11 @@ class accessor :
   }
 #endif
 
-  template <int Dims = Dimensions,
+  template <typename AllocatorT, int Dims = Dimensions,
             typename = enable_if_t<
                 (Dims > 0) && ((!IsPlaceH && IsHostBuf) ||
                                (IsPlaceH && (IsGlobalBuf || IsConstantBuf)))>>
-  accessor(buffer<DataT, Dimensions> &BufferRef)
+  accessor(buffer<DataT, Dimensions, AllocatorT> &BufferRef)
 #ifdef __SYCL_DEVICE_ONLY__
       : impl(id<Dimensions>(), BufferRef.get_range(), BufferRef.MemRange) {
   }
@@ -398,10 +398,11 @@ class accessor :
   }
 #endif
 
-  template <int Dims = Dimensions,
+  template <typename AllocatorT, int Dims = Dimensions,
             typename = enable_if_t<
                 (Dims > 0) && (!IsPlaceH && (IsGlobalBuf || IsConstantBuf))>>
-  accessor(buffer<DataT, Dimensions> &BufferRef, handler &CommandGroupHandler)
+  accessor(buffer<DataT, Dimensions, AllocatorT> &BufferRef,
+           handler &CommandGroupHandler)
 #ifdef __SYCL_DEVICE_ONLY__
       : impl(id<AdjustedDim>(), BufferRef.get_range(), BufferRef.MemRange) {
   }
@@ -416,12 +417,12 @@ class accessor :
   }
 #endif
 
-  template <int Dims = Dimensions,
+  template <typename AllocatorT, int Dims = Dimensions,
             typename = enable_if_t<
                 (Dims > 0) && ((!IsPlaceH && IsHostBuf) ||
                                (IsPlaceH && (IsGlobalBuf || IsConstantBuf)))>>
-  accessor(buffer<DataT, Dimensions> &BufferRef, range<Dimensions> AccessRange,
-           id<Dimensions> AccessOffset = {})
+  accessor(buffer<DataT, Dimensions, AllocatorT> &BufferRef,
+           range<Dimensions> AccessRange, id<Dimensions> AccessOffset = {})
 #ifdef __SYCL_DEVICE_ONLY__
       : impl(AccessOffset, AccessRange, BufferRef.MemRange) {
   }
@@ -438,11 +439,12 @@ class accessor :
   }
 #endif
 
-  template <int Dims = Dimensions,
+  template <typename AllocatorT, int Dims = Dimensions,
             typename = enable_if_t<
                 (Dims > 0) && (!IsPlaceH && (IsGlobalBuf || IsConstantBuf))>>
-  accessor(buffer<DataT, Dimensions> &BufferRef, handler &CommandGroupHandler,
-           range<Dimensions> AccessRange, id<Dimensions> AccessOffset = {})
+  accessor(buffer<DataT, Dimensions, AllocatorT> &BufferRef,
+           handler &CommandGroupHandler, range<Dimensions> AccessRange,
+           id<Dimensions> AccessOffset = {})
 #ifdef __SYCL_DEVICE_ONLY__
       : impl(AccessOffset, AccessRange, BufferRef.MemRange) {
   }
diff --git a/sycl/include/CL/sycl/buffer.hpp b/sycl/include/CL/sycl/buffer.hpp
index d9f75d520d238..f150a60a341f2 100644
--- a/sycl/include/CL/sycl/buffer.hpp
+++ b/sycl/include/CL/sycl/buffer.hpp
@@ -21,7 +21,7 @@ class queue;
 template <int dimensions> class range;
 
 template <typename T, int dimensions = 1,
-          typename AllocatorT = cl::sycl::buffer_allocator>
+          typename AllocatorT = cl::sycl::detail::aligned_allocator<T>>
 class buffer {
 public:
   using value_type = T;
diff --git a/sycl/include/CL/sycl/detail/aligned_allocator.hpp b/sycl/include/CL/sycl/detail/aligned_allocator.hpp
index d99dd9dba166f..a7925aac63338 100644
--- a/sycl/include/CL/sycl/detail/aligned_allocator.hpp
+++ b/sycl/include/CL/sycl/detail/aligned_allocator.hpp
@@ -10,9 +10,11 @@
 
 #include <CL/cl.h>
 #include <CL/sycl/detail/cnri.h>
+#include <CL/sycl/detail/common.hpp>
 #include <CL/sycl/detail/os_util.hpp>
 #include <CL/sycl/range.hpp>
 
+#include <algorithm>
 #include <cstring>
 #include <cstdlib>
 #include <memory>
@@ -20,8 +22,8 @@
 
 namespace cl {
 namespace sycl {
-template <typename T, size_t Alignment>
-class aligned_allocator {
+namespace detail {
+template <typename T> class aligned_allocator {
 public:
   using value_type = T;
   using pointer = T*;
@@ -30,10 +32,7 @@ class aligned_allocator {
   using const_reference = const T&;
 
 public:
-  template<typename U>
-  struct rebind {
-    typedef aligned_allocator<U, Alignment> other;
-  };
+  template <typename U> struct rebind { typedef aligned_allocator<U> other; };
 
   // Construct an object
   void construct(pointer Ptr, const_reference Val) {
@@ -46,11 +45,15 @@ class aligned_allocator {
   pointer address(reference Val) const { return &Val; }
   const_pointer address(const_reference Val) { return &Val; }
 
-  // Allocate aligned (to Alignment) memory
+  // Allocate sufficiently aligned memory
   pointer allocate(size_t Size) {
-    Size += Alignment - Size % Alignment;
+    size_t NumBytes = Size * sizeof(value_type);
+    const size_t Alignment =
+        std::max<size_t>(getNextPowerOfTwo(sizeof(value_type)), 64);
+    NumBytes = ((NumBytes - 1) | (Alignment - 1)) + 1;
+
     pointer Result = reinterpret_cast<pointer>(
-      detail::OSUtil::alignedAlloc(Alignment, Size * sizeof(value_type)));
+        detail::OSUtil::alignedAlloc(Alignment, NumBytes));
     if (!Result)
       throw std::bad_alloc();
     return Result;
@@ -65,5 +68,6 @@ class aligned_allocator {
   bool operator==(const aligned_allocator&) { return true; }
   bool operator!=(const aligned_allocator& rhs) { return false; }
 };
+} // namespace detail
 } // namespace sycl
 } // namespace cl
diff --git a/sycl/include/CL/sycl/detail/buffer_impl.hpp b/sycl/include/CL/sycl/detail/buffer_impl.hpp
index bd7ad79bd012f..c0765fa00d48a 100644
--- a/sycl/include/CL/sycl/detail/buffer_impl.hpp
+++ b/sycl/include/CL/sycl/detail/buffer_impl.hpp
@@ -22,6 +22,7 @@
 #include <CL/sycl/stl.hpp>
 #include <CL/sycl/types.hpp>
 
+#include <cstdint>
 #include <functional>
 #include <memory>
 #include <type_traits>
@@ -35,7 +36,7 @@ class accessor;
 template <typename T, int Dimensions, typename AllocatorT> class buffer;
 class handler;
 
-using buffer_allocator = aligned_allocator<char, /*Alignment*/64>;
+using buffer_allocator = detail::aligned_allocator<char>;
 
 namespace detail {
 using EventImplPtr = std::shared_ptr<detail::event_impl>;
@@ -59,7 +60,10 @@ template <typename AllocatorT> class buffer_impl : public SYCLMemObjT {
       return;
 
     set_final_data(reinterpret_cast<char *>(HostData));
-    if (MProps.has_property<property::buffer::use_host_ptr>()) {
+    size_t RequiredAlignment =
+        getNextPowerOfTwo(sizeof(typename AllocatorT::value_type));
+    if (reinterpret_cast<std::uintptr_t>(HostData) % RequiredAlignment == 0 ||
+        MProps.has_property<property::buffer::use_host_ptr>()) {
       MUserPtr = HostData;
       return;
     }
diff --git a/sycl/include/CL/sycl/detail/common.hpp b/sycl/include/CL/sycl/detail/common.hpp
index 4031e138f8d47..42a522d59c9eb 100644
--- a/sycl/include/CL/sycl/detail/common.hpp
+++ b/sycl/include/CL/sycl/detail/common.hpp
@@ -103,6 +103,9 @@ template <class T> T createSyclObjFromImpl(decltype(T::impl) ImplObj) {
   return T(ImplObj);
 }
 
+// Returns the smallest power of two not less than Var
+size_t getNextPowerOfTwo(size_t Var);
+
 } // namespace detail
 } // namespace sycl
 } // namespace cl
diff --git a/sycl/include/CL/sycl/detail/image_impl.hpp b/sycl/include/CL/sycl/detail/image_impl.hpp
index 51a11639081f2..65617cd4e8e28 100644
--- a/sycl/include/CL/sycl/detail/image_impl.hpp
+++ b/sycl/include/CL/sycl/detail/image_impl.hpp
@@ -26,7 +26,7 @@ enum class image_channel_type : unsigned int;
 namespace detail {
 
 // utility functions and typedefs for image_impl
-using image_allocator = aligned_allocator<byte, /*alignment*/ 64>;
+using image_allocator = aligned_allocator<byte>;
 
 // utility function: Returns the Number of Channels for a given Order.
 uint8_t getImageNumberChannels(image_channel_order Order);
diff --git a/sycl/source/detail/common.cpp b/sycl/source/detail/common.cpp
index d9841251aa195..25379b367945a 100644
--- a/sycl/source/detail/common.cpp
+++ b/sycl/source/detail/common.cpp
@@ -237,6 +237,17 @@ vector_class<string_class> split_string(const string_class &str,
   return result;
 }
 
+size_t getNextPowerOfTwo(size_t Var) {
+  --Var;
+  Var |= Var >> 1;
+  Var |= Var >> 2;
+  Var |= Var >> 4;
+  Var |= Var >> 8;
+  Var |= Var >> 16;
+  Var |= Var >> 32;
+  return ++Var;
+}
+
 } // namespace detail
 } // namespace sycl
 } // namespace cl